G22 Trigger Problem?

[Danomite]

I have a Glock 22 3rd Gen. The trigger safety seems to come too far forward and when the trigger is pressed to the rear, the safety sometimse "click" off rather that just move out of the way. I have checked for burrs to the frame and trigger. Has anyone had this problem? Should I use this as an excuse to buy an aftermarket trigger? If so, which one. I could use some input here guys!

[Duck of Death]

Bevel the edges of the trigger safety where it enters the trigger.

[Glock-N-Fun]

The back of the safety(area that contacts the frame)can also be sanded/filed just a tad to releive pressure,i do this when i do a pretravel mod.