What about some sort of new "Perk" or "Mastery" system to address some of these issues? Probably would make a bunch of extra work and more coding, but this could address some issues for each class that can either boost each class, and maybe even at an expense to some ability or ...