I'd go with the new M-70. I would purge it of MIM parts, which would include the trigger, not sure about the current extractor. At one time, replacing the factory extractor with a forged steel, aftermarket part was the way to go. I'd pillar bed, glass and free float mine, then take it to the range.

IMHO,

DF