Thanks for the great explanation 2152hq. I removed the trigger mechanism this weekend and had a closer look at it. There's no reason for me to mess with the sear engagement surfaces. They are beautifully polished and crisp. I cleaned the mechanism and lubed the pivoting surfaces.
Looks like the best fix would be for me to try and find a single trigger to swap out the double set triggers. I have a feeling that find one might prove to be very difficult.