Right answer! Be a fighter, not a gunfighter, the gun is one of a long list of tools that may be applied to the problem. This is about Mindset.
Becareful with contact shots when using a semi auto handgun. Not only the very real possibility of pushing your weapon out of battery, if you do get a contact shot off, there will be 'Guacamole' all over you and on & IN you gun. Many pistols will jam. It is one reason a revolver is superior for the contact shot. Ask me how I know. My experience was military many years ago in WestPac. Work hard at keeping the bad guys further away than that. If you are there, some how your plan failed. Now start applying your defensive tools as necessary, quickly.
I found that in/during CQB that the vertical or horizontal butt stroke from my M14 was the most effective weapon/instrument (our E-Tool was another winner used in this full contact xtreme sport with the blade folded and wielded like a mace or battle-axe.). Never needed much of a follow up with the Butt strokes/E-tool properly applied. Down side was they were too "Darn" close when applied. Usually meant something had not worked out as planned. Either that or the NVA didn't get their copy of the plan. I hated that.
Seems to be some very good training by the OP. Be ready, and get some training so as to shoot well while laying on your back, or stomach/side too. No telling where a fight for your life will take you. Just remember the bad guys never get a copy of your plan , and/or choose to have the unmitigated gall to tyre to live and do it their way. Think of all your training as a box of tools to be applied as required. Generally more tools are a good thing. It's a guy thing.
Good luck.
Fred
I no longer fight the NVA, I now fight the VA.