First off, welcome. Buying the Aero upper will definitely help, as well as their pins. As for PSA parts beware, much of their early products and claims have been untrue of being compatible. I use the pws tubes, and Heavybuffers.com for spring and buffers (it uses the car10, not the anti tilt, and I prefer the XH, reduces recoil a bunch!)