I’ve dropped an 18650 cell into a 26650 light without even a sleeve without incident. It might shift position if dropped or slapped hard enough, but that’s it. The springs hold the cell firmly enough.
Make the tube big enough to accommodate a double-wrapped (ie, protected) 21mm cell and be done with it. There’s zero reason to shave 1mm off the diameter and limit yourself.