What I would suggest (and what I did) is the following:
Take the spring, and cut all of the coil off except for the base (and the remaining coil of wire that is meant to retain the spare bulb). You might want to leave a little coil in place in order to make sure that the spring will be able to stay in the tailcap by itself.
Then, take a vice and use it to make the small bulb retaining coil smaller. there isn't really a specific way to do this; I just put the coil perpendicular to the vice and used it to squeeze the sides of the coil until the end was centered in the middle of the coil. Then, you need to make this coil stick out so it functions as a spring. I would suggest using something as a lever, or putting it in the edge of the vice at an angle.
The new end of the spring should stick out about 7-8 mm from the bottom of the coil.
Here is what mine looks like:
I am currently using it with IMR 26650s, but I was previously using it with both protected and unprotected 18650s.