Sometimes getting the trigger bar cog to go into the right spot in the hammer unit body and hammer can be tricky. Glad you got it solved. Sometimes hammer pin springs can be stubborn. I keep spares around. The final test will be when you install the new hammer pin spring. Then you can rule out its rubbing on the trigger bar. Since you have it working now you know the trigger bar is good.