There are only 3 led lights with dropin chargers that I know of
1. Inova T4
2. Pelican 7060
3. Streamlight stinger LED
Maybe you can try a new nimh battery pack in your 9an, instead of the stock nicad pack. You can probably double the run time with one.
Streamlight makes a version of the LED Stinger with dual switches, one near the head , and the other at the tail! I am not a LEO, but I am going to get one of these at some point. I have the old version of the LED Stinger with the Lux LED, and I really like it. The new version is much brighter with the same long runtime. I was able to get two much higher capacity batteries for it also. The one that comes with it is a Nicad 1800 Mah battery, the two I use are 3000Mah NiMH.
Mike