I've always carried a proper fighting sized EDC and spare magazines for all the reasons you mentions.

My biggest change has been in how I practice. Got a timer, and some steel, and IDPA style targets, and focus more on the variety of shooting you are describing.

One drill I've added is the "Jack Wilson":

3 second par time,15 yard head shot from concealment.

Last edited by antelope_sniper; 03/31/20.
You didn't use logic or reason to get into this opinion, I cannot use logic or reason to get you out of it.

You cannot over estimate the unimportance of nearly everything. John Maxwell