when i first got mine the passenger window and mirror switches didn't work... noticed there's a cup holder directly above it.
..forget the details, but somehow took the switches apart and cleaned the contacts. I think there was either a chocolate milk shake or coca cola at the root of the problems. (maybe root beer?)
I see that pic and almost envy you the restoration job. One nice thing about these cars is they are well engineered... it's much easier to fix things that were well made in the first place. They come apart and go back together rather well.