Quoted:
Would replacing the hammer with a non-notched hammer solve the problem?
View Quote
Sometimes, depends on how high the hammer sits when it's cocked. Even the normal hammers can drag on the firing pin. Plus, changing one part in the FCG may require retiming the lower. You're better off to try breaking the edge of the hook first (look for the shiny spot) and going from there. Is your firing pin retaining pin bent or difficult to reinstall?
The hammer could be sitting to high bc of a short trigger (distance from pin hole to sear face) a bad hammer (mislocated hammer notch) or mislocated T/H pin holes in the lower (not likely with PWA).
Remember, this interference only happens when cyling the rifle with the trigger forward. Except for the initial loading, the trigger is to the rear while the bolt is moving while you're shooting. So while it is irritating, and a sign of improper parts and/or assembly, it's not fatal.