I would get all the parts you want(new trigger/hammer/sear/safety), box them up and send it to Gans. He built my last 2 guns and I have been very happy with his service. He has a crazy fast turnaround. also shoot with a few others who have his guns with great success.
Dawson big hands works well. If you go to a evo grip, I would recommend the limcat v2 magwell.