Get a hold of the guys at AAC style, they are a forum sponsor and do amazing projector and halo work. Jonathan has OEM housings in stock that he can do up and ship complete. These guys aren't cheap but there work is amazing. Another option is Jeremy McFail at the retro shop. You would have to send your housings into him but he too does some awesome work on lighting.
Stump3r. Thanks for you response. I was wondering if you can help me find a suitable headlight/ housing so I can do the HID upgrade. Any help you can provide would be great. This will be my first project, so I want to make sure I do it right.