Just to follow up for anybody in the future reading this, I called and talked to David some more and what I settled on is doing a SRS-1 kit and the T2 disconnector. I got them installed this past weekend and they are certainly a BIG improvement. The DA is really nice now with the lighter weight hammer spring, the reset is noticeably shorter and the pre-travel is almost entirely gone in SA now thanks to the new disco. There is maybe 1mm of pre-travel, the remainder before you hit the wall is lifting the FPB. It's very nice, big improvement over before. If anybody is thinking about just doing the SRS, do the T2 disco as well, it's an extra 5 min of time and makes the SRS kit even better.