I just stuck an 18" PSA pipe on one of my guns. Shot same groups with same ammo. Have same plans as you too. Better trigger and optic and this things going to be great. I bet it gets better after some more shooting and then start hand loading.;)...