Go with upgraded bulbs, Sylvania, Philips and GE make some decent ones. With HID it is a hit and miss, and bypassing stock wiring with aftermarket wires and components, especially with cheap units is always a risk.
I don't see an issue with properly designed projection lenses that are designed for HD. But not sure how you can accurately evaluate them. I don't think it is cost-effective for most driving conditions.