So I went with CW Accessories for a new Guide Rod/Spring and Barrel Bushing and Spring Plug. Basically the PES and the Guide Rod/Spring combo pack.
Chet was extremely helpful and offered great customer service, thanks SCSURFER for the recommendation.
I'm excited to shoot it tomorrow morning, I'll make sure to post up my experience. Just a note, the tolerances are a lot tighter and there's no need for the set screw which is nice.
Here are some pics...