It looks like most places are sold out of the good 18350 cells.

You might consider looking for a good quality protected cell (like Keeppower 1200mah) and then remove the protection circuit. Slip a new cut down 18650 sized wrapper over it. It’s not ideal, but might be worth it.