The lack of availability of CR123's at Fred's Bait Shop is why I've steered away from CR123 based lights until recently. And yep, that's a real store. You can get AA's there, but not CR123's. If you don't mind driving 30 miles from the lake to a Walmart so you can buy 2 of them for 9 bucks, go ahead.
With the advent of RCR's all you have to do is take the charger with you on a trip and you're good to go. I always take spare primaries too, but rarely use them. I've taken the plunge and now EDC a Olight T20 Q5. However I normally have a CL-E twisty in a pocket too. I'm also exploring the use of 17670's in the T20. They last longer than the RCR123's but I lose mode switching, the light just runs on the highest setting that it's got voltage for. It's OK, but I'm only going to use them for spare batteries, because I like the ability to use low. If for some reason I'm caught short on batteries, the 17670 will give me a pretty long runtime.
I try not to "rotate" lights as invariably I'll need the one I don't have. With the CL-E and T20 I've got most of the bases covered. If they ever make a LOD Q5 or R100 I might replace the CL-E with it, or just add it to the keychain. Then I'll have lights in three battery types and I should be able to find batteries for at least one of them.