Blizz should change Hellfire instead of removing it. How about when cast, the warlock is immune to all melee/spell dmg, but still receives the dmg from Hellfire.
It's still a tradeoff, but now a viable tradeoff,
I think it'd be worth it if there was a bunch of mobs, and you need just that little extra to take em out.