If you want super high lumens, I would go the 18650 route. I have done so, and I am pleased with the inherent higher capacity and the very reasonable size. I am using a Zebralite headlamp and a Nitecore P12.Comparable models are available from other sources, including Fenix. I still keep AA lights, primarily because the batteries are so common. More and more,I depend on my 18650s.
_________________________
Geezer in Chief