You might want to clean the mechanical speed control too. It could be that some of your problem is that the contacts are dirty. While you're at it, give the motor a clean as well.