Hood Furling Mast Question

[Tsuru]

Our mainsail on our 1995 Oyster 435 is off for the winter and I’m in the process of mast inspection and preventative maintenance. I noticed that the clevis pin that marries the track to the luff rod turnbuckle, just above the tack has partially backed out. One of the cotter pin legs broke off and the other, luckily is wedged in place holding the pin (although it has backed out 4/5 mm). To replace the clevis pin I’ll need to ease the luff rod turnbuckle. I’m not sure what supports the hardware below the tack fitting when the clevis pin is removed. I could ease the turnbuckle, push the clevis pin back in and replace the cotter pin, but I’d like to have something a little more secure and am considering replacing the pin with a bolt secured with a Nylock nut. Any suggestions on how we should proceed?
Beyond greasing the top bearing is their other work I should consider. Note that the mast was refit 2018/2019 and is functioning properly.

Ray
SV Aurora
435 #64