For a commuting light I think the perceived need to stick with AA or AAA is not really necessary and increases the initial cost and operating cost.
18650 based lights are cheaper to buy and operate and out put much more light. Think of 18650 as a AA on Steroids.
The downside is to get a decent price you have to buy off the internet.
I currently operate two flashlights (single cell) and have 2 sets of batteries and cycle thru them.
My low end, typical 18650 cell cost me $2-4 and last 2+ years.
They get daily use.
Sorry I can't get the model numbers right now, but there is alot of good 18650 flash light recommendations on this Forum.