AC Heater Switch help needed with swap

Ok. Seeing as my old switch was beyond salvation, and armed with a multimeter and the above schematics, I have found that the two terminals that can be traced back to a source of power are simple on/off switches and separate from each other.

On the 1965 switch, the power comes into circuit 1 and is jumped across to circuit 2. When any button OTHER THAN the "off" push button is engaged, the circuits are bridged.

On the 1968 and up switch, each circuit is powered independently (a good idea anyway) and, just like the older switch, when any button OTHER THAN the "off" push button is engaged, the circuits are bridged. Except the newer switch has two "power outputs".

So I can't see any reason (now) why the switch won't work, provided it is wired as per the 1965 diagram. With the exceptions that I'm going to run a separate power lead with fuse to circuit 2 and not use one of the "output" poles on Circuit 1.

The attached diagram shows my thinking. So, fingers crossed it goes into the car in the next couple of days..Stay tuned for whether it works or fails.