Bonjour Jacques,
it is of course your decision, and I don't want to push. Your preferred version 1 from Arne will work fine, also. Usually 80% is good enough, if the last percentage points would require a relatively large amount of extra work - in your case, a different mast than at hand.
I definitely agree with Arne: Please, at least, build cambered panels ;-)
Cordialement,
Paul