Personally- I prefer the idea of disciplines and jobs. Perhaps adding more disciplines or advanced forms of existing disciplines to combine into? Different styles that your sword/hand-to-hand/axe etc can evolve into with skills that splash into any job? There is a ton of potential here.