I'm in for a new skirmish for endgame, but I don't think Hauntlet needs a rework. That skirmish is cool as it is. If you have a problem with energy drops in some of the endgame areas you should adress it in a specific post. Asking for nerfs won't bring anything good beside frustration for some players who already find energy farming proces being tedious.

Cheers!