I had a similar problem when I sailed my Prindle 18. I found that rakeing the mast as far back as possible is important. The goal there is when you sheet in hard on the main, you should almost be block to block. So you probably need to add another chain plate to the forestay to get the mast a little farther back.