Thanks Matt for the advice.
I just replaced my old upper rudder castings with a nice used set of adjustable upper rudder castings from PreSailed Parts. What a difference, the cams unlock when you lift the tiller now and I was able to rake the rudders more so the weather helm is just right with a raked mast.