Warrior is needed and necessary (or some equivalent). The other classes/subclasses are the ones in need of more of a look in my mind and it helps to think about the skills associated with each class:
Warrior (Swordfighting, Jousting, Leadership)
Courtier (Bureaucracy)
Priest (Oratory)
Subclasses:
Hero
Cavalier
Infiltrator (Infiltration) - swordfighting comes from warrior and not infiltrator right? can a courtier/infiltrator train swordfighting at the academy?
Trader (Trading)
Diplomat/Ambassador (Oratory)