From the picture of your bolt. I would round your bolt where it makes contact with the hammer and polish it so it looks more like the newer bolts and I think your problem would go away.
I have a JP full mass bolt carrier with GI bolt and Geissele high speed national match trigger and probably 9000 rounds through it with three barrels and three GI bolt with no issues.