my choices for your three categories... actually four... I EDC two lights...a AAA Eneloop 2014 E05 on the key ring, and the AA Eneloop Solar Force Z2 in a pouch along with a spare G42 magazine

the Solar Force L2M has a low voltage (.8-4.2v) XP-G R5 smooth reflector with 18560

the 3 x cr123 Solar Force L2N with tube extension has a long throw M3 head (XM-L2 3 mode)

with a tube extension added to the L2M, with the lower voltage module it works with 2 x AA