In my opinion, just restore the subclasses to they once were. Like you said all subclasses has the ability to counter each other, restoring the subclasses should balance out the game more.