I've standardized on AAA for EDC and PSK where weight is important and AA for most other gear.
Have a small AAA radio, Arc AAA, AAA minimags, AA minimags, AA digicam, etc. I have a few Lithium AA batteries stocked and 10 NiMH AA rechargeable and a charger that will charge AA and AAA NiMh and NiCad and will charge from 120 or 12v. Buy the regular AA's and AAA's in the 16 count bulk packs for about $10. I gave away mu D call mag light and anything that takes those stupid coin cells that don't last more than a few days when they are actually used. The only thing now in the house that takes anything else is the two smoke detectors which take 9v batteries, the keyless entry fob for my truck and my 9.6v Cordless drills/saws/flashlight but those have their own special rechargeable.