If you change the trigger, I recommend either TriggerTech or Timney, in that order.