I finally found the intestinal fortitude to do the CGW upgrade package along with all of Earl An's suggested polishing tips per hi YouTube videos. I also put on the GGW striker and short reset trigger. Amazingly, I had no leftover parts. I'm pretty handy doing larger scale projects such as plumbing, electrical, and easy carpentry but not so proficient with the small fiddly bits. The gun cycles as it should by hand.
I will be going to the range in the next few days as I have done upgrsdes to many of my handguns and rifles recently but haven't had a chance to shoot them. Wish me luck!