I would not wait for SF.
I might actually want to use it this year!
+1
I'm not holding my breath for Surefire anymore. The P61L and KL9 head were in the 2008 catalog, but the items still aren't available.
Consider some protected Lithium-ion Cells. I've purchased Lumens Factory bulbs for my M3,
AW 17500's cells and a
HO-M3 will likely make you happy. You can also go higher to the EO-M3, but runtime will suffer.
You can also add a cell extender and use two 17670's for more runtime, 46 minutes with the HO-M3, and 36 minutes with the EO-M3.
milkyspit does some awesome LED conversions, but they ain't cheap. His thread is here:
https://www.candlepowerforums.com/threads/175320
Also, I have a KL2 head, its a complete waste of time.