Sticky switches.

[Water Warrior 2]

I still have the old 83 Silver Wing and intend to sell it. I have tried contact cleaner to make the switches work smoother but they are still dragging more than I would like. All the switches make good contact thankfully.
Any recommendations to clean them up more and then use more contact cleaner after that? I would like the bike to be a little more user friendly for the next owner.
I'm also thinking I might put it on the road for a couple months for myself while it is for sale. It is not near as friendly as the new bike so if I do drop it somewhere I will need help lifting it. Whoever helps me just may get a free bike. It is basically a good bike but not for me.