wiper motor woes

I replaced the ground strap and cleaned the points where it connects between the bell housing and the firewall. It seemed to help a little bit.

What I have figured out is it runs perfect with the ignition on ACC. After I crank the engine they work okay for a minute and then they start stuttering.

Could it be the switch or the motor?