I fully expect the problem to be the switch. You might possibly pry the switch apart and clean the contacts. I have not tried this on this particular switch, but I have been successful on many other MB switches, particularly in the 123 cars.

Good luck,