I've also pushed most of my lights in the CR-123 direction. I have an HDS U60 with tritium locators in an aftermarket SS bezel. I love that light, it sips the batteries and will drain them down to 0. Can't tell any difference between the Surefire and BatteryStation batteries, so that's what I stock.

I also keep a couple of the 36 packs of AA's. Those mostly get used for toys around here, but I have a couple of lights that use them, lights that I wouldn't mind giving to someone else in an emergency situation.

Don't really have anything else that I just have to keep spare batteries for, so it's lithium CR-123's and alkaline AA's.

BTW, I just saw on the GloToob website that they'll have a version in CR-123 out in Feb. Now I'll just have to get one.