Orbtronic.
I have a few of all the different 18650s they offer.
Get the ones you need and just keep an eye out.
I'll also use Thrunite and Olight rebranded batteries. I have NOT had great luck with Fenix rebranded batteries, personally, so I stay away from them.