You mentioned that you recently repaired your rudders ... I recently had a similar problem as you describe and after doing all the mast rake, toe-in, toe-out adjustments I learned that one of my rudders was slightly delaminated causing "flexing" once loaded-up--creating significant weather helm.

I'd check to be sure your rudders are sound before you continue on the adjustment(s) path.