I'm fairly new to cat sailing but my 80's h-16 has 2 sets of reefing points on the main. Seems to me that you could find a used h-20 main and have reef points added to it if you don't want to alter the one you have. I am not even sure you could find a roller boom for a h-20 but if there is one it's probably lot's of $$$$.