the low availability right now of a lot of popular 18650 batteries?
Yup. I went looking for some recently myself. I have a substantial stash at my other house, but it's 1,000 miles from here and when I realized I only had two spare cells here, I decided I should do something about that. I had intended to be back at the other house by now, but things haven't worked out the way I had expected due to my wife's elderly parents' state-of-health.
Anyway, I also went with a batch of Moli P26As. I've been using them in my ADV and have to agree with Mooch; they're good batteries. I also really like the fact that Moli doesn't think we're too stupid to use loose cells.
I refuse to buy any re-wraps, and the Sony/Murata and Samsung cells I found in stock were all at least 50% more expensive than they used to be.
The new batch of Molis arrived on Friday. They were reasonably fresh; manufactured December of 2020. I charged them to 3.6V for storage, put them in a freezer bag with a desiccant pack, and they're now in the fridge.