There are a couple of places that sell the replacement lens. They sell out VERY quickly though so it is difficult to find them in stock. They used to be $180/
pr but are much more expensive now I believe. Let me see if I can find a link.
And yes, cutting out the old lens does suck. I do not recommend a dremel though. I used a hot razor blade and it worked much better/cleaner.
Edit: here you go... and LOL much more expensive now. $419!
https://www.bimmerjakes.com/en/headl...356869052.html