I have a suggestion for a nice light body that you might like, it's called the Inova 24/7. I use one for several things and its an extremely useful little light. Eight modes of lighting and useful in any situation. Not a Weapons light per say, but very useful in everything else you might be doing. Link:
http://www.flashlightsunlimited.com/inova24-7.htm . Mine is a grey one that I mount on my FSBE AAV for use at signaling, illumination, discreet map reading and other things. Very fun to use at a rave as well with the the distress feature
. Hope that helps at all.
In your post though, I've messed around with that particular light and I liked it, but didn't apprechiate it as much as I do my surefire lights. It's useful for most applications, but surefire can do the same thing.