Just curious.....did you gauge the chamber? That's really the only way to determine if your headspace is bad. Of course having brass pop primers is also a good sign, too. LOL
Replacing the bolt with a GI bolt will most probably fix the headspace problem however it's not a drop in deal. It has to be lapped in. Only a good smith will know how to do that. Nothing is taken of the receiver. The Chinese recievers are of extremely good quality and in spec. The bolts, however, were too soft from the get-go.
So, pick up a GI bolt and find a good smith. I don't know the fella mentioned by the two other posters. I do know that "Warbird" ( http://www.warbirdscustomguns.com/Rifle%20Shop%20services.htm ) has done more of these swaps than most other guys. Also, he knows how to do it so it won't require replacing the barrel.
In any event, once you get that attended to, you'll have a fantastic shooter.
Rome