for me personally, I wouldn't get a larger framed Glocks (20, 21, 29 or 30) SF or not, don't fit my hand as well as the Standard size frames like your 23 and when you add more powerful defensive ammo to the mix, it become more difficult to maintain a good grip. In addition, the expense of ammo, even cheap practice ammo are factors that you should take into account.
I do have a Gen 4-23 that I carried for several years, which I felt at the time was the perfect carry/home defense weapon available before I made the switch to the 43X MOS, carried IWB and backed up with two Glock 22 mags with +1 extensions carried in a Stick Holsters dual mag sleeve, off hand back pocket.
I don't care for weapon mounted lights, don't like the idea of having to pointing my weapon at what I want to illuminate. I have something similar to the Switch Back I've linked below, watch it and you'll get the idea.
my suggestion would be to get a 40 to 9mm conversion barrel for your 23, a Glock 19 & two Glock 17 mags (minimum), a maglula, a case of cheaper FMJ ammo and take a defensive handgun course.
in becoming proficient with your current handgun you'll know what works for you, what you don't like and what you'd like to change, once you get there, then consider a new handgun.