I would get the TYC clear headlights and do an E55 retrofit.

If you don't have that kind of cash, I highly recommend the JDM headlights with aftermarket bulbs. The cut off line is amazing for a reflector based setup and the glare is minimal, and the light distribution is phenomenal with super little warm spots.