Something I have thought about for a while is to get rid of subclass and have instead specialisations. The specialisation in general would not add more abilities, but boost the relevant ones. So as you say a courtier would have the non-combat skills and be able to fulfil all those roles, with a small advantage in their area of specialisation.
We already have skills, specialization seems redundant.
