If money & time is no object I would wait 12 months and then review the LED offerings.
Got my new SR500 light head with custom cable from Solus before xmas and the customer service and build quality is fantastic. (
http://www.ssp.ie/products.htm).
The SR500 is much brighter on land compared to my 10W HID - and hopefully will last a bit longer (am the owner of three bust Halcyon 10W HID heads now and have got fed up with having to repair them).
Haven't managed to get the solus wet yet, but will post a report once I get the chance. Am waiting with baited breath for their 8 degree optics. Current light has 12 degree beam.
[M U S T go D I V I N G soon!]