Proper length P60 hosts?

I like using P60 hosts + flashlight mounts as a light on my bicycle because it gives me lots of versatility. That said, the hosts I'm using (both Solarforces) have too long of a body, so the spring contact is pretty loose, and the flashlights like to switch modes on bumps. Pretty annoying.



Im using protected 18650s, which should be even longer than normal, but Im not getting any better contact pressure. Part of the annoyance is because P60s have two springs, one on the positive end of the driver and the tailcap spring, so the battery floats between the two springs.





So, any proper length P60 hosts out there, where I can use a 18650 without having to drop in a spacer in the back? Im using a small 1/4 socket to do it now, but its not very elegant, to say the least.