Could you use an 18650 plus a spacer (either purchased or manufactured)?
_________________________
Geezer in Chief