I ordered a new switch, knob, and lock cylinder from Moss.
"Classic Gold" Brand.
About $100 including shipping for the parts.
The barrel on the new switch is slightly smaller than original, causing the switch to rotate in the dash, since the locating tabs do not engage the slots in the dash as intended. Perhaps some electical tape around the barrel would aid for a kludgy partial fix.
The retaining clip is just not correct and will not hold the switch in the dash as intended. Perhaps some careful rebending of the wire clip could make it work.
The knob has a small hole that engages a pin on the barrel of the cylinder to retain. You push in the pin with a narrow wire tool and then pull the knob off. On the new knob the hole is not drilled precisely, so the pin will not engage it and therefore will not hold the knob on. Redrilling the hole may work, but will, of course, mess up the look of the nice new knob.
Because of all these issues, I am debating trying to salvage my old switch which will take some work and may not in the end be successful, versus modifying the new parts to try to correct the problems. It's a tough choice, because the new parts do look good and cosmetically very original in appearance.
Alternatively, I may research whether there are any other suppliers that may have better quality reproductions. If anyone knows of any please let me know.