Yep, refinishing is the least expensive route but I would give Wolverine a call just to get their opinion on the issue, if nothing else they can alert CZ to the issue.

If you're serious about long distance precision shooting (http://rimfireprecision.ca), the MDT chassis is nice solution but $400 is the starting point, the stock and grip are extra.

The RIA M22 is a nice enough rifle but not in the CZ class, I have one upgraded with a few 10/22 parts from when I was undecided on whether to go the 10/22 or the CZ route. My thinking at the time was that if I did go with the 10/22 all the upgrade parts would be usable in the 10/22 but, I settled on the CZ so one of these days there will be a nice and upgrade RIA M22 for sale!