I would say that what you describe is 100% normal and expected. If/when you experience the dreaded "click", you will feel resistance in the single action trigger pull and then it will push through (click) and then you can pull further and discharge the handgun.

Typically... you will only let the trigger out until it resets -- and you will not feel the "click" for subsequent shots until/unless you take your finger completely off the trigger.

The trigger click and spring failure is, IMO, extremely annoying, and bothers me even a bit more because we all know how great these guns are.