I am having issues with flat-top 21700s fitting various lights. This has affected Convoys (L21A) to many others. I just ordered a button-top 21700 to see if I can get any better results—so far, they don’t seem to have the same trouble. Any other experiences here?
Too short?
If the batteries are too short, a magnet spacer can be the cure.
BUT only if the cap goes straight on. Like most single cell lights.
Multi-cell lights like the Q8, LT1, or SP36, that have the positive end “wipe” against a brass ring are not to be used with magnets.
Magnet spacer sitting on flat top battery used on a headlamp that needs a button top.

You can get these magnets in different lengths to fit different tube sizes.
All the Best,
Jeff