Yep... I always try to find the best answer. Or the answer in between what will work out the best for me. Indeed around the pop rivets the mast has some wear, now we have fixed it again, and made the system usable again.

@Jeff Thanks, we'll keep it in mind, and also try to play a little with the battens. I think we're at a point where we just have to trial and error a bit