And honestly, the fact that there are more classes yet to come also implies (to me) that there are more companions yet to come. We might not get a gigantic 25-person roster, but I would expect 10-12 by the time the game releases.
I sure hope so. Not only is the current selection quite limited, it also feels like something a very inexperienced (and edgy) DM would come up with...