Beck to the clean, dry, tight electrical stuff. Check further in. I guess you will find more corrosion.
Good - Fast - Cheap: Pick any two.
E23 735i; E30 318i; E32 735iL; E38 735iL; R50 Cooper; R55 Cooper Clubman.
E21 318i; E32 735iL; E34 535i; E38 730iL; E53 4.4i