Dear Paul,
the new sail plan looks a good shape, I think you must be hoping this is the final version (though your Sailmaker may not!).
I see you have marked the centre of area of each panel and the combined centre. This could be miss-leading as my understanding is that the centre of pressure close when hauled can be more like 1/3 back from the luff . This increases the moment arm of the jib and reduces that of the main.
Hope you back is well on the mend and you are back on the water, or will be before the end of the season. That said don't over do it, these things all take time, I know as I also overdo it!!
cheers
Mark