Petell,
One solution to your stock fit problem is having a stock bent. This runs in the $150 neighborhood.