I think the yard and head of the sail will lie naturally a little closer to the mast than you've drawn them, but if the calculated lead is really 6%, as marked on the drawing, then that is probably to the good. Otherwise, the positioning of the rig looks OK to me. However, I'm not at all sure how to achieve a sound structural design for the tabernacle as you've drawn it. I've seen a catamaran with a kind of tripod tabernacle, and this might be feasible for Amber, with the main part of the tabernacle deck-mounted, a straight strut down to link up with the keel bolts (to take tension and compression), and two strong struts out to the edge of the deck, forward of the foot of the mast.