Might want to check out Mooltipass. I got mine from tindie and they’re worth a look IMO.

I’ve used imrbatteries.com a handful of times in the past, no issues so far and my oldest set of batteries are several years old at this point.