I'm searching the screw-in spacer seen here http://www.ebay.de/itm/200LM-Zoom-3-Modes-Waterproof-CREE-LED-Flashlight-Torch-/280664949812?pt=US_Flashlights&hash=item4158ef4434 to fit 18650 batterys in one of those: http://www.ebay.de/itm/Adjustable-Focus-Zoom-LED-Lamp-Light-Torch-Flashlight-Cree-torch-LED-Hiking-/270868031030?pt=UK_SportsLeisure_Camping_LightsLanternsTorches&hash=item3f10fe2636
I got one from Buyincoins.com. Can't reach the site for now so you'll have so search for it in BIC. Although it seemed to be an extender for a 3xAAA light it was smaller than my CR123 X2000 I got from DX. But it may be a good fit for another one with a smaller diameter.
Found it on ebay: http://www.ebay.com/itm/Extension-Ring-Tube-Rechargeable-for-Flashlight-18650-/300584806182
Now I need the plastic thing to put the 18650 battery in.. only thing I found is this: http://www.dealextreme.com/p/18650-to-26650-battery-converter-case-sleeve-white-94487
My extender looks the same and it didn’t fit on a Cr123 x2000 bought from DX. I don’t know if this can fit.
For the spacer, it is easy. Just use some cardboard or thick paper around your battery. I use AA batteries in Solarforce 18650 hosts by wrapping them with paper.
Make sure the emitter is properly glued down before putting an 18650 in it. My X2000 was direct drive and it was the only light I have had burn the emitter up because the emitter was just pressed in by hand with nothing holding it to the pill. Since replacing the emitter reinforcing the pill with a washer and gluing it together with Fujik it's unbreakable. I have been using my X2000 for working in the garage for over a year using it for a hammer beating the hell out of it and it won't die and yes it's still direct drive. I have even forgot it turned on on multiple occasions until the battery dies and it keeps going.