From what the developers have previously said, they seem to be aiming for 12-13 companions (maybe not all as origin characters with deep backstory, but still). And all the Player's Handbook classes should be in the game eventually, surely those additional companions will add to class variety as well. As to when they'll be ready, who knows. They've also said they'll look into making the origin characters more customizable, but no specific details or confirmation yet.
