There's a lot you can do with the warlock chasis though. Candle caster for example or a hex based subclass that's not a gish sure why not.No. The warlock is a different concept drawing from a different part of fantasy.
Witch is just a label,existing mechanics can cover it.
I think the Psion is a good example where you need a new class.