If you are not married to the OEM glass concept, I have heard good things about the lens replacements for late-model fogs sold at BMWlight.com. $49 for two, of course they are plastic but everything I have heard is they are nice quality. I plan on buying and then slapping on some tinted lamin-x, I never use the fogs and I just want to freshen up the front end. Just my 2 cents.