Projector Retrofitting will take care of both those issues!
Owner picked up a set of DEPO lights, so the lenses were in perfect condition.
I went with my Bi-Xenon HID Projectors, covered in a ridiculously trimmed down version of the Ocular Shroud; all in the low beam spot.
Since the projectors are Bi-Xenon, we no longer needed the high beam spot for anything, so, as usual, I converted that area over to a Super Bright LED, for use as an auxiliary light as well as DRL if needed.
I placed this light on a switch that was mounted inside the vehicle on a blank switch panel.
This circuit turns off with the vehicle, so the owner doesn't have to worry about running his battery dead.
The entire headlight received and nice coat of semi-gloss black paint, and the lower portion was smoked to allow light through.
Project was fun and a owner loves his new lights.