Have you considered taking a look at the new third generation Mag Lites and seeing what you can do with them? Give you a new category of lights, NiMH battery lights. Old Lumens has a video review of them just posted and indicates he likes what he sees.