your head light switch is the one we took out of the parts car, so it was a used one to begin with. We changed it out when we got back from florida. I don't think that we tossed out your original headlight switch, I'll dig around if I find it I'll let you know. You should beable to make one good working headlight switch out of the two, since they had different issues.
Keep in mind that your wagon has the non daylight running lights US switch vs what we could find in the junk yards around here so I don't if the US switch is the same as the Canadian cars