For myself, I think Main Classes should be as per 1st/2nd Ed Advanced (Fighter, Cleric, Magic-user, Thief) which could branch out into sub classes and sub-subs from there.
That said, there is still too much choice, not enough optional, to the class system in Current D&D, would like more...