Here's the Pics.
Even though the wiring colors are different, the S1 (79-80) and S2 (81-83) switches operate the same, and can even swap side-to-side. After cleaning the contacts and re-soldering I got the pair of S1 switches to work in my 83. They do have a slightly different look to the actual rocker, not enough to notice until you have one of one and one of the other.
The first 2 pics are the S1 switch from the top, and then from the bottom to match my diagram.
The last 3 are the S3 switch assembly. Notice that the wiring for both switched combines into the one 6-pin harness. So if you have one switch go out (and don't want to do the old snip-and-solder to the wires) you have to replace the whole unit.