3m has a complete kit for $24. Have not had time to do it as the weather has been in the 90's with humidity all last week. Will post before and after once done!

I did both of mine ('04 X5 4.4 w/xenon & adaptive) with the 3m product and the outside looks great, but the driver side still has haze/dirty/lite scratches on the inside. Any ideas? what about replacement lenses?

None that I know of. Plus, the facelift headlights are extremely difficult to take apart in order to replace the lenses.