Also have you checked the loom on the switch, these can work lose and sometimes dont sit on the switch well. My old XR3i used to love chucking the wire off the switch.