I would wait... In the next 2 years or so the cost of HID will probably drop dramatically because of the cost to mass produce them... kinda like computers ya know? Plus you might be able to get something better fitting (or even BETTER LOOKING) for much less money than a retro-fit job done today.
I read an awesome article in R&T about fiber optics. They say that it might be possible to have a "light engine" placed in the car somewhere then use Fiber optics to carry the light to everywhere lighting might be necessary - headlights, brakes, dome lights, dash, etc... because it can carry so much light and is quite reliable and resiliant as well. And would be much cheaper to not only implement, but maintain and repair as well.
Interesting times we live in.