Suggestion: what if you rethread the "1D" to accept the tailcap, modify the switch, and use a 400mAh Li-poly cell? Make a real cute light, and I think you have just enough length to make it work...
I used jb weld to put it together. And the 1d I ran out of tubing. I was gonna use to 1d for spare parts but I it still works. So keeping it together for now. Hope you like them.