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 cost to having so many classes -- both in needless complexity, and in concepts that can't be built. Why do we need a Wild Shape feature when we have alter self and polymorph? Why shouldn't Turn Undead and Bardic Inspiration be spells too? Why should the scholar-spellcaster be forbidden access to healing magic? Sweep away the cruft and focus all the designers' efforts on making one polished, balanced, versatile caster class that can be whatever you want it to be.
If 1D&D is indeed moving to prepared spells for everyone (gutting the sorcerer's raison d'etre, which was already on life support), the warlock is the only caster class left whose mechanics are distinct enough to justify standing on its own. Maybe that's not a good enough reason to keep it; but in that case, let's not waste designer time or page count on yet another 9-level caster with a coat of black paint.