Ok, I am new here, but Dom I believe you have a Luger with the Dusseldorf experimental safety mod. That is the ultra rare and highly prized models with the 31lb trigger pulls; no unintended discharges with those puppies!
Dom, I am just kidding of course, and attempting to substitute bit of humor for my lack of being able to contribute any technical advice. I do believe you have your answers in the posts from folks above. I hope their suggestions enable to resolve your trigger problem. Keep us updated.