I don't think there is an issue with the classes. The issue is with the armoury system and your character becoming a mixing pot of every other class.

I think we can keep the classes as is just work the Armoury system.