O.K. first of all you dont need a new hammer.
I respect SBR7_11's opinion, but I dont agree 100%.
I had the exact same problem, all I did was ramp the bolt myself and Viola!
Gun goes Bang!
I have a Bussy lower with a two stage trig and I did not want to mess with the hammer.
I looked at the bolt and saw what was needed, just a little dremmel work and you are done.
I would be happy to post some pics as soon as I can.
I almost forgot about your bolt problem!
If you need to you can pull the charging hadle back till the hammer gets unstuck, remember you dont need to pull the bolt all the way back, then with some sort of un marring divice push the hammer down while riding the charging handle forward keeping an eye on your bolt, soon as it gets past the groove under your bolt let it go forward by itself.
If that does not work pull the handle back and keep releasing the bolt with the bolt release till it clears the hammer by itself. You might get lucky and it might pass by on its own once or twice.