There are two ways to adjust for weather helm. One is the rudder and the other is the mast. Yes you sould be able to get some of the weather helm out by raking the mast more forward. If you are not in race mode and only looking to have a nice time sailing it should be fine. If you are racing then you will want to set up your boat the way the fastest do. If that means that the mast rake is where they place it then you will have to work the rudders, even if that means you have to do some drilling and filling.
Later,
Dan