You may want to consider a recoil spring swap, not that the 18lb factory is bad, but changing to a Wolff Gunsprings 22lb may keep you brass for achieving Low Earth Orbit! With a factory 18 lb I found some brass to be almost 30' to the right rear of the shooting position, some where never found!
Congrats and good luck with yours!