Standing the mast up straight also increases the sail power. Depending on the wind o' the day, you may need to rake the mast back for better control.
Figure out your rudder problem with the mast raked 10 degrees and then you can tune the rudders to the rake.