Opitmal mast rake is not something figured out by trigonometric calculation. It is figured out but trial and error. Assuming you have an adjustable backstay try rigging an adjustable forestay and testing different degrees of rake. Rake aft till weatherhelm is felt in the rudder at moderate heel. I raked my mast 12"-14". I got moderate weatherhelm. Does the boat point higher? Probably, tho these things are difficult to quantify. Sail a lot. Try different configurations. See what works. Above all else, listen to Jerry. Nobody goes to windward like Jerry. If you can get him on your boat do it. We Montgomery sailors have this forum for exchange of ideas and the wisdom of one who devoted his life to our boats. How many other sailors have such a resource? Put it to use. Go fast, enjoy the ride. We sail one of the best boats on the water. Don't get too caught up in the details. My Monty has taught me to trust. It can take more rough stuff than me. She shrugs off too much wind by rounding up, rarley gets me wet, never ships water. When others douse sails and run for home we bash on, getting to windward safely. And she's beautiful, too! Montgomery 17 Ol'44