gene just don't forget to plug it in.
i'm a firm believer in keeping things simple, leads to less human error.
i would complete your repair and leave it wired the way it is.
if it screws up again, just replace it. they are common and inexpensive. no one would belittle you for having a non vintage break away switch! it is a safety item, for you and fellow drivers on the road.
if there is any doubt to it's ability to function get a new one!
they make plastic ones that will not corrode.
and you can still get metal ones with the brass pin, except they have added an o ring to the pin to keep water out of the switch when it is installed.