sounds like you're doing a good job of spring cleaning.
One suggestion, you should get a solid boom vang if you haven't. In addition to providing the boom vang function, a solid vang will also solve your topping lift issue. Having a topping lift to take up the boom when you are throwing in a reef helps the whole process go more smoothly as you dont have the boom dropping into the boat, or water...a solid vang would also do that job.
Certified...in several regards...