I recall having the same problem in a HW that I rebarreled. I didn’t have the base for the main spring and was improvising. The thicker barrel needed a thinner base, and then the end of the hammer dropped into the action, went too far back, and snagged.
What I did was to file the top of the base I made. IIRC (it was a while ago) this made the mainspring dip downward at a slight angle. Not enough to seriously add compression to the spring, just enough so that bumpy little tab on the end (designed by a genius!) pushed a little harder on the end of the hammer’s cocking extension (that comma-shaped thing in front).
Suddenly, otherwise inexplicably, the hammer spur still dropped into its slot in the frame, but didn’t go back and snag on it coming back up. I declared victory, for whatever reason, and went on to other things.
You might try pinching a piece of shim stock between the mainspring and the front and then the rear of your mainspring base, and see if “tilting” the spring slightly helps your problem. It isn’t a permanent change to any part, so even if it doesn’t help, you’re no worse off.
(By the way, you wouldn’t want to unburden yourself of that ponderous, heavy, jarring, ruinous-to-accuracy old hammer, would you?)