Wellll, that didn't last long. I was continuing to play with the safety in the uncocked position to get it functioning a bit smoother and then it stopped working at all in that position -- it just would not rotate to lock. The safety does, however, still work in the cocked position so at least I have that working for me.

I am tempted to take the bolt apart and try to figure out how the mechanism in there works to lock up both the bolt and firing pin.