Chafing on gaff spar

[patfurr]

I am experiencing some significant chaffing on the forward end of my gaff spar on the upper side.  It has two different wear points.  the first one is on the cast aluminum tube cap and the second point is on the spar itself about 4 inches aft of the throat.  I suspect that the cast cap is coming into contact with the main halyard clevis, but I don't see where the wear is coming from on the more aft point.  I am considering replacing the main halyard clevis with a simple screw link to eliminate any potential wear points.  Has anyone else experienced this?