There's a whole world of endless mod IF you can cough up the money for it. For that particular light, you have many options. For instance, if you want another emitter, it's easier to just buy another emitter mounted on an MPCB board and swap them over. They're all held behind a plastic centering disc that'll center well if you're up to it. Just a little unsolder/resolder for XM-L2 U3.
If you want throw, get the XP-G2 R5. I went the other way around with an old crelant before I sold it. I made a custom pill and slapped an XR-E behind an aspheric. Drove that thing at 2.8a and fried in 2 weeks. It was awesome at throw but didn't last long as I expected.