After searching automotive parts shops on several continents for the missing connectors without any luck I decided to try out Minakers scrapyard which is just down the road from me. Randy, the current owner, went into the "inner sanctum" and in short order came out with some switches of an unknown origin, with the right connectors. Had to sacrifice the switches, but now have the right connectors. Nice to be able to rebuild the junction boxes and remain faithful to the original design.
Peter