Willy,
Just a suggestion on my part...
Check the wear on the trigger sear and/or hammer full cock notch.
The symptoms you describe indicate a warn trigger sear may cause the trigger to slip off the full cock notch a bit too soon, and hang up or the half cock notch, causing more damage to the trigger sear (and maybe to the half cock notch).
A warn full cock notch on the hammer may cause the same issue. Both need to be checked out.
My best,
Blair