For about $100 for the part, I might just suck it up and replace it at this point. Seems like the path of least resistance and will for sure fix your issue.

__________________
Kirk
Las Vegas
2016 X5 40e Mineral White/Black Dakota Leather, ZLL, ZCW, ZDA, ZDB, ZPP, multi contour seats, rear side window shades, HK stereo
2011 E90M3, 6-speed manual