Since Montanas were mentioned, the one I have played with should have never left the factory...maybe a 6 CM barrel would fix it...
Lilja is the easy button there. You can order the factory dupe contour and 12-16wks later it's on your doorstep. Thread, chamber, put the stock on and rock on.