you have it pretty narrowed down. check the simple stuff first, like the switch, it may need some electrical cleaner on the plugs who knows.