If it has springs on both ends the 18650 should work. If not a longer spring on one, a few magnets or a solder blob could get you the 3mm you need.