Greg,
In this digital age, I know that some of the switches I have used in the past are no longer commonly available.? I did find what I was looking for on eBay.
I have seen industrial switches in the past that were over $100 EACH and about the size of a salt and pepper shakers.
You might spend some time going through Mouser's or Digikey's websites.? You may find that this will take a while of looking.
Most modelers, when needing more contacts, find them on their switch machines. I'm not familiar with your switch machines, so I don't know if this will work for you.
Good luck!
Allan