Well an 18650 battery is 18mm in diameter and 65mm long, so you would need a battery that is half the length of the 18650, the 16340 seems to be the best one on the market. If you stick with LiFePO4 it'll keep you at 6V where the LiIon will be at 7.4V.