OK...Here,s a stupid question...why do you have 2 switches, I,m thinking the original seized up and they installed a second one instead of fixing properly.
Great start to near perfect car...but low mileage cars still need money thrown at them also....wheel cyl,trans re-seal, anything rubber would be on my things to do list to make it long distance car.