I would be willing to bet all your trigger issues would be resolved if you replace the trigger bar plunger spring and the trigger return spring. I would also deep clean the trigger bar, plunger and the recess it all rides in.
https://www.gunpartscorp.com/products/432830L
https://www.gunpartscorp.com/products/403320K
If it were me, I would also replace the trigger bar spring while you have it apart.
https://www.gunpartscorp.com/products/464350
Do the sideplate numbers match the rest of the gun?