This.You started out with one heck of a pistol.
In my opinion, the only improvement the PPQ needs, out of the box, is better sights, so I'd suggest that you look at what's available and make a decision, or wait a bit and see what new offerings are available in the market by the time that you actually get to use the pistol.
Nice score!!! I have one myself in 9mm.........still haven't fired it. Bought it mostly for the extra magazines for my other ppq m2 that I use in IDPA.
If you don't mind, how much did that beauty cost ya? Did you buy it at a LGS or over the internet?