As noted above, just replace the mounts. BMW made the headlights with easily replaceable tabs. I noticed a broken one on my headlight as I was dealing with some other headlight issues and found this kit.
https://www.1addicts.com/forums/show....php?t=1541480