Have finally retired my trustworthy MagLite Solitaire with the custom LED upgrade, as I have finally found the ideal AA powered flashlight.
http://www.banggood.com/Cree-XP-G-R5-300...t-p-947405.htmlWould highly recommend it for the fantastic craftsmanship as well (could not find how to open the battery compartment as the crack between parts you want to unscrew is machined so perfectly). I can tell you with confidence - that is the smallest in diameter AA Cree LED flashlight on the market at the moment (16.5mm), which will snugly fit into the side flex loop of the stock Leatherman Wave ballistic nylon pouch. 3 easy switch (half-press) brightness modes. Very bright. 2 color temperatures available to get (the 3000K, I've got, is almost incandescent like colored). Watertight, comes with 5 spare O-rings. Trustable attach point. Smooth cylindrical shape. Reliable tail button construction (had disassembled mine to check, it's serviceable in the field using LM Wave). Just ordered a second one.
The last thing I need to replace is my green laser, and I can finally forget about stocking on AAA cells. Everything else is AA based.
UPD: For Amazon lovers:
http://www.amazon.com/3000K-4000K-2-Mode-Stainless-Flashlight/dp/B010EZED8A