You could solder tabs on the 18650’s so they better mimic a typical alkaline battery ... To center the batteries inside the Maglite he used a few strips of cardboard from a case of beer ...

The key takeaway from these results is that GEN3 batteries retain an average of 82% capacity at 900 cycles. To put this into perspective, a comparison with leading commercial 18650 battery cells ...