Your new build is already an excellent result! In the screenshot below you can see how the leeway punishes you now when you try to pinch too close. This is the behavior I was reaching for in my earlier tests.
Better yet, when you try to sail with just F&A sails, the ship falls off. Ideal behavior there. I haven't tested tacking yet, so that will have to come in a later post.
