I guess I am misunderstanding something: If the driver-side (master switch) lock-switch is able to actuate the passenger door lock motor but not its own, how is that a result of bad contacts in the switch? Sounds more like a bad connector or three, probably buried under the dash.