Do what makes you feel comfortable. If you like the feel of the G30 and (more importantly), you can accurately shoot with it...then USE IT!
I owned a Glock 30 for a year and it shot very well. FYI, I traded my used G30SF with night sights for a brand new G27 evenly. You might be able to swing that for a G23 or G19 at a local gun show. It might be worth looking in to.
Either way, stay safe and good luck!
He’s the fellow to please-never mind all the rest,
For he’s with you clear to the end.
And you’ve passed your most dangerous, difficult test
If the man in the glass is your friend.