Avalon 95

I have a 95 Avalon. the windshield wiper has problems. When you turn the wiper on, it works at both speeds, but turning in off is a problem. You have to time turning it off as it reaches the bottom. The varible timing setting does not work. I put another tested switch in and it still does the same problem. Someone told me the next step would be to place the motor. Is this correct?

Steve