I bought a 336er a while back that had the forearm replaced with a thinner one. It does not fit correctly and moves front to back about a10th of an inch and the finish doesn't match the butstock. Is there a way to make the forearm fit if I was to refinish both to match, or should I buy a new set that matches?