I took my TG apart and another one as well, wanted to compare the spring and detent on the safety. The M1D spring was longer and had more bent "up: than the other and softer one. I altered the spring to match and put it back in, better but not 100%. The other item I noticed was that the safety pulled the hammer back when applied, so you are also fighting the hammer spring.
The spring that was longer and tighter came out of a CMPsold rifle and appeared as new and original but very likely done by the Greeks (supposed to be a Greek return).
Balance of the spring looked good and matched the other (I have 2 spares as well, new and orignial GI - supposedly), They were all pretty close.
I am going to keep at it but for now it is better, can be applied without pain and definately work! And, will not come off on their own!