It'd be simpler to just have two base classes, and then an "elite" subclass (hero for warriors and ambassador for courtiers).
I've actually taken that stance (or something very similar) before in discussions with Anaris. I do tend to think that we have a few too many class/subclass combos. I don't know that I'd go quite so simple. though. Anyway, that's getting too far ahead in the discussion.
