I was able to disassemble the rifle this past weekend. It was clean and oiled inside. I swapped the similar sized trigger return spring with the sear spring. That made the problem much worse. It appears to be a DSA hammer kit. Where does that leave me? Which parts need replaced?