Almost. Tax stamp or not, a rifle can never become a pistol. Only an sbr. ATF issued a ruling a year or two ago saying that is not the case anymore in their eyes. It seems to fly in the face of the law as written, but they now allow you to change a pistol into a rifle and then back again. For now, ...
I have a G2X Pro for EDC. I hate having to use 200 lumens every time for EDC. It's just not necessary and will drain your batteries faster. For a weapon light G2Xs are great though. You can support a local business and buy a 6PX from Sealed Mindset for $98.50 if you're into local businesses.
I just sold my P30 in .40. I liked it but didn't want .40 anymore. You're right on the DA not being very great but SA on it is good. Depending on what kind of guy you are, you can always run it like a 1911 if you get a safety model. But make sure you know for sure whether you want one or not because...
I've talked with Larry at great lengths. He is a great guy. He was a Lieutenant with the teams, is very smart and his concept for training is sound. He's more focused on giving Joe ignorant the mindset for protecting hiself and family. But he does also have classes for LE/Mil types.