Shorter Protected 18650?

I was given a YLP Gryphon 180. Cells are in series, so I’d prefer to use protected as the instructions recommend. I don’t have many to try for fit. A 3400 EVVA fits, but quite snugly and isn’t easy to remove. I can just barely jam in a 3500 EVVA. It’s difficult, and the spring is fully compressed. Can’t be good for the battery ends. There may be enough length variation among batteries that some of either flavor won’t quite fit.

Even an extra .5 mm of clearance would make a big difference. Are there any quality protected cells that are slightly shorter than the ones I have?

If anyone reading this has one of these lights, which batteries are you using?