As i have said before steve, i think its going to be the switch.

Cheap part aswell, so would be easy to chuck one on anyways.

When you going to do the flush?