No, the Occam's Razor solution is to scrap the entire class. Scrap all caster classes except one, call it the magic-user, and make it serve all concepts equally. Pick your casting stat, pick your spell list, and you're good to go.
And I mean that in all seriousness. There is a very substantial...