The aftermarket has FINALLY caught up to our headlight deficiencies. It no longer cost $1300 to buy a set of aftermarket projectors. Not saying a retrofit isn't a good solution too, but buying these still give you the option to go back to stock. There are several styles now, like chrome and black. These just came out not too long ago. I have been eye balling them pretty close...
http://www.ebay.com/itm/2008-2012-Mi...item35b946f354