Anything to replace the Fenix HP30R on the horizon?

What I’m trying to decide is, should I mod my HP30R to WW or is there likely something similar and better with a broad flood, punchy throw, and an external battery pack that will replace it?
It seems to me that a headlamp with external battery is not very popular.

I like mine for the dual beam, quick glance battery gauge, and it feels like a serious law enforcement tool.