Surely someone else has thought, "hey, I have all of these 18500's sitting around. Why haven't any of the machining wizards or Chinese manufactures modified the tube to accept them?"
How hard would it be to cut and thread the tube so you could remove a small "ring" and use all of these...