CR2032's and 2016's are no harder to find than CR123's, they're cheap if you order them online, and Photon-type coin cell lights are absolutely great, every BOB should have a handful of them. You can get the lights for a buck or so apiece or even less, and that /includes/ the coin cells.

Aside from that, I agree with the general sentiment here. I do see AAA's as a reasonable alternative to AA's. Example AA kit: CMG Ultra-G led light, Princeton Tec PT40 4AA light, generic 2AA radio, Garmin eTrex 2AA GPS, etc. Similar AAA kit: Arc AAA, Princeton Tec Rage (4AAA), Countycomm 2AAA radio, Garmin Geko 2AAA GPS, etc.

The Geko is a shrunken down version of the eTrex as far as I can tell.

FWIW, during the east coast blackout a couple years ago, all flashlights, AA cells, and D cells were sold out from stores almost immediately. But AAA cells, C cells, 9V batteries, CR123A's, etc. were plentiful. So having some battery flexibility can be useful if you need to obtain batteries from your surroundings.