My car had the exact same symptoms - replacing the switch solved the problem.

One thing that was an unexpected positive was the new "smoothness" to the turn signal switch. Never thought anything was wrong with the original until I installed the new switch.