cdb,
I have the same deal going with my Tikka CTR. I planned to switch the stock out for an M40 from B and C. But it shoots so well, I just can't get myself to risk it. I took a precision rifle course and the instructor checked it out and he told me not to mess with it. So I am leaving well enough alone too!
