New Idea for ya:
"
Fighter (Axe)
> Warrior (Axe & Bow) [A hunter and trapper, this seasoned fighter can take down a squad of pikeman and still bring home a deer to feed his family. Great terrain movement]
> Hero (Sword & Axes) [Balanced fighters. Strong and quick with the ability to fight close and distance enemies]
> Marauder (Axe & Dark)[A troubling Axe wielder made for striking first. Terrible aim and defense, but is able to attack two enemies simultaneously with great power]"

So no more axe knight and now you have a galeforced axe user.

As for the Grandmaster setup, I made it like that because it is more viable, IMO at least, that a Grandmaster would be more likely to switch to, say, a random class with a completely different style/weapons because the Grandmaster has a good understanding. Where most of use would have to stay in our range of expertise. A Swordmaster isn't very likely to become a Valkyrie.