I would suspect the switch, in both cases, mine stopped similarly, I was able to take the switch apart and clean the contacts, works great....
Should be a post about it, be careful, the contacts are spring loaded if I remember correctly, I used dielectric grease to hold everything in place.... ;)