Mast rotation

I have a late 70's H16. Last year I added a second adjuster plate to the forestay to rake the mast. When I do the rake measurement the line at the stern is about 2 inches below the the bottom of the pontoon. So it is not raked as far as many of the forums recommend. However what I notice is that given the rake that exists, the Mast will rotate past the stops. Sometimes the mast stop will rotate over the stop and 'stick' and not want to rotate back when I come about. Any suggestions?

Replace the mast step and/or base.

The mast step has changed at least 3 times, each one allows more mast rake.

The current version of the mast step has extra-large rotation stops and the "chip keeper" system. It's worth the $.