"...ton of sail" - May I suggest you devise a method of reefing main and jib? This will allow you to expand the range of winds in which you can sail. Once a ship heels past about 45degrees, the rudder loses effectiveness, which can result in the model becoming uncontrollable - been there done that :-). Exercising micro seamanship, ie reducing sail before the hull is overpowered, makes the cruise much more enjoyable, for me, anyway.
Jimmy James, over on Model Mayhem, figured out some nice ways to reef. Mr. James passed away recently, sadly, but his posts will live on. A search of the forum over in UK will find his methods, with photos and drawings.
Very nice job,Jda, she will be beautiful on the water.