Ouch. I would start looking all body grounds. Add a few too. You can't never overdo grounds on a vehicle. I recently did some on a Benz C240. I was surprised the entire battery ground has only two points. Multiple body and engine grounds were added.

__________________
'06 X5 3.0i - bought @143,123 miles (12/26/20)