Mark... I attempted to standardize my lights to AAs a couple of years ago, and except for the CR123s on the weapons lights have pretty much done so... I chose the AAs over the AAAs for the added run times, but this did lead to some difficulty in finding the right appliances... for a headlight I went with the Black Diamond Icon (earlier version on closeout that does not have the red LEDs for night use) for a flashlight I went with the Fenix E21... I use Sanyo Eneloop AAs and have a Goal Zero 7w panel as well as a Fujicell SCH808F multi input charger...

these are what I came up with ... good luck

lower left... Black Diamond Icon, Gerber Infinity task light, Fenix E21, and Coleman 3AA High Tech area light...the battery pack will not charge my older Motorola...Midland W300, and Reecom (not shown) weather alerts and older Grundig all use AAs