I'm going to stick with a higher-capacity autoloader for self-defense, at least for the time being as I have good reason to feel more threatened than usual.
This topic is complex, for all the usual reasons, but the comment above is salient to the discussion. I'm definitely a revolver guy, but I'm getting my first semi-auto because snubbies and semi-autos fill different roles in the SD picture. For CCW, the snubbie's strengths work best for me in day-to-day business.
I live in a low-crime area of my city, and in a well-defended subdivision on a cul-de-sac. It's very rare for shootings to occur in this district, and my exposure is mainly limited to gas stations and store parking lots. For the most part, if I need a gun, 5 to 6 rounds should be sufficient and the revolver has superior intimidation value. Trouble is most likely to come in the form of a single assailant.
But, per the quoted part above, when I travel to the crime-ridden parts of my city, when I'm downtown at night, my sense is that the threat picture is increasing the odds of multiple assailants and the semi-auto seems like the more appropriate tool. Also, it will be enjoyable to learn a new platform, new techniques for care and maintenance, and keep things interesting. My heart is with revolvers but my head is telling me to increase my options.