I've run into a bit of a problem solving boat balance in heavier air (18-25kts).

I have a decent main and I used to have a fairly beat up jib with my mast slightly raked (almost straight) and the boat felt very well balanced going to weather while double trapped roughly between the crossbeams but a little towards the aft one.

Since then, I purchased a new jib.
Now the bows really want to surge downward and the crew and I are positioned much further aft than before. I tried raking the mast back 2 more holes but I'm still experiencing
what seems to be excessive downward attitude. It's manageable but just doesn't seem correct.

I've raked the rig back as far is it will go but have yet to test that and I'm quite sure I'm going to run into unnecessary weather helm.

Any suggestions would be appreciated.