Rake the mast farther back; it moves the center of effort of the sails more aft on the boat. When you hike/trap out, get way back on the windward aft corner.

Warm regards, Jim