Stewart,

I'm not sure on this, but I sort of thought the little starter switch had elongated holes where it's mounted on top of the starter.

My idea would be to slide the switch back a tad so the starter drive was almost completely engaged before the starter was asked to spin.

Be sure to inspect all the linkage for sloppy joints, and give the starter drive a exam too.

Stuart