Thanks for sharing your experience. Hopefully as you say, you have solved the issue. In any case thru this you have gained intimate knowledge of the operating system and how the parts interact and rely on each other to an extent, for flawless operation of the gun.
You probably heard all this before but, a couple points....
One also should remember that many times aftermarket parts do not immediately "fit" because there may be a thousandth more here or a thousandth less there when made, that requires some fitting or in some cases, just plain won't work.
It's been recommended that one mod be done at a time, test ok, then do another so it takes the guesswork out of what's causing a malfunction.
Post back after you fire it to let us know.👍🙂