accessory switch

My scoot is a 99' RoadKing FLHR. Just turned 50K. I've got a "small" issue with the accessory switch mounted on the gas tank. I think the contacts might be corroded as I need to wiggle it a bit to get the engine light on the speedo, and headlights etc. Once I jiggle it and make the connection-...