Have you tried Deoxit? It works much better than contact cleaner in my experience. I just got a beautiful old Sony STR-6046A from an antique store and used contact cleaner and it helped the issues some, but they weren't totally fixed until I got more Deoxit and sprayed all the pots and switches yesterday. It removes the oxidation that I don't think contact cleaner does.