If you can't wait you could consider buying a G&P light. All the parts are surefire compatible. Eg:
http://cgi.ebay.com.au/G-P-T-9-XENON...QQcmdZViewItem
That way you get the body and can also use batteries, bezel, lamp etc as spares or for other projects.
All depends on what you are planning to do. I'm waiting for a Leefbody because I want to use 18 series rechargables.