Just to close things out ... S2 is now perfect!
All done and all good! Talked to CGW via email and they gave me some tips. Trigger bar spring and further work on the disco. I have the blue spring in now and will shoot it that way first. Once I decide on ammo, I will swap in the black spring and see what I get. Will run an 11# recoils spring. Once I got the disco final fit, I took it out one more time and glass beaded the transitions and surfaces (lightly) and am getting a really smooth DA pull. SA is crisp. Reset is excellent. Polished all surfaces as instructed (on all components). Feels great. Functions perfectly. Waiting for my buddy to mill the slide for the optic. Will post pics when complete.