I sold my Shield and my G43 and decided to carry an M&P 2.0C or a G19 complete with an extra mag for the same basic reasons you state. The Jerod Reston story is reason enough on its own.
I also added a light to my EDC equipment and a bleeder kit to my truck, range bag and had a Stop the Bleed class scheduled and cancelled due to this mess we’re in now.
I too have my own timer, plates and USPSA targets, almost all practice is drawn from concealment and most matches are just practice for what if.
I do still have my J frames but only carry one when I’m wearing my running shorts.
