I would look at Langdon Tactical's 'trigger job in a bag' with the short reset trigger bar. That with the 'g' conversion and maybe grips will improve the gun dramatically.