I think I'm going to go ahead a buy a new switch. Worst case, it is not the switch but then I have one as a spare part in case of future failure.

If anyone has other experience with this, please let me know. Thanks