Eswanson,
Your newfound problem is that the hammer is catching the firing pin on the return stroke, or the hammer is binding up on the disconnector.
Check the disconnector just behind the hook. See if there is a bright line where the hammer hook has been tagging the disconnector. If there is a line, use a file and remove some metal from the tail of the hammer to prevent binding/contact.
As for the hammer catching the firing pin on the return stroke. Check the top, back of the hammer for signs of wear. The hammer may be riding a little higher than normal. If this is the problem, again use a file and remove a little metal from the top/back of the hammer where it is catching the firing pin. You don't need to go buck wild, just roll file to remove a little height of the cocked hammer.
Now for the rough surfaces, we have taken a vote and decided that you must break the rifle in the military way.
This means that you have to carry the rifle around with you, like a third testicle, never firing the rifle, and having to clean the rifle at least three times a day. It helps if you hand the rifle to you're wife and have her throw it back to you, telling you that it is still filthy, even after you have slaved cleaning the thing for a hour.
In a few weeks, the rifle will nicely polished (all the cleaning) and be ready to fire.