I don't think I've mentioned this before, by over the winter, I made some changes to the battens.
The lower battens were 30mm diameter, and the higher, more highly stressed battens were 38mm diameter - all GRP tube. The 30mm diameter battens were a little more flexible than I liked.
Now they are all 38mm diameter, and for the sake of getting the most stiffness and strength with the least weight, I invested in CFRP for the new tubes that I bought. I used the existing GRP tubes for the forward battens, where the extra weight would be helpful in dropping the sail, and used the new CFRP tubes for the after battens, where the reduced weight and increased stiffness was most beneficial.
At the same time, I moved the second hinge further aft, so that the sail camber line is now a smoother curve. The hinges are now at 30% and 56% of the batten length. Also at the same time, I re-machined the hinges to increase their half angle from 4° to 5°. The camber is now about 10%. These changes may have moved the CP a little further aft, but in my case this is a good thing, as I needed just a little more weather helm. The helm balance is now excellent, with very little rudder angle being needed on all points of sail.