Welcome Jim, sounds like you have it under control.
Yes mechanical switches in general seem to be going extinct for ss type circuits
so saving what seems to be junk otherwise pays sometimes.
I once did a ganged array like that in a Sony 1980's amp where they were all badly
oxidized inside and causing weird symptoms.
I immersed the entire gang in several inches of plain vinegar, actuated them all many cycles,
let them soak 20 mins and an large amount of crud surfaced to the top. I followed up with water,
then some deoxit to protect them and it came out fantastic.
With the cost of contact cleaner thru the roof these days, vinegar makes a good alternative.