you got a heck of a rifle there,do the numbers match on the bolt/ect to the rest of the rifle?
if the #'s match i would let a smith give it a look over,& get him to fix it ''right''
if the #'s dont match,i would pick up another bolt body,change it out & call it a day
Sarco,inc. have jap type 99 bolt bodies for 20bucks.then have the headspace checked!