Instead of using an 18650 battery holder (by the way I have a low profile 18650 battery holder made to mount on a PCB that might fit too), to use these instead.
One of each end of the cell with an attached battery lead and silicone seal each end and you're all set.
One of each end of the cell with an attached battery lead and silicone seal each end and you're all set.