HP EEVE3610A power supply range failure? (solved)

[Debunque]

This has been brought up in another thread, but without a clear resolution.

I have a EEVE3610A, and it looks like the max current in CC mode stays at 2.1A even when switching from 2A mode to 3A mode.  Except sometimes it goes into 3A mode.  And sometimes tapping on the button makes the current jump between 2.1A and 3.1A.    Does this sound like a bad range switch, or could it be something else?

If a bad range switch, can anyone suggest if the right approach is to get a can of contact cleaner and try spraying it when still in the board, or should I replace the switch?

If replacing the switch is the right way to go, does anyone know of a suitable mouser, ebay, or digikey replacement?  (that's really my main question)

Or is the switch so hard to find that I should just wire in a DPDT toggle and some washers? 

EDIT: solution was to spray lots of contact cleaner into the switch.  Hope this helps someone in the future.