Fell in love with 10" screen

I'm a software engineer who also does regulatory compliance work, so I spend a decent amount of time doing paperwork in a coffee shop. After one software project, I was left with a Surface Go 3 (the lowest-end version with 4 GB of RAM), and I started using that for coffee shop work.

It's wonderful.

There's barely enough RAM to open three tabs on Edge. If I get lucky I can run Outlook or Teams (but not both) and still get something done. Any Windows feature update requires me to uninstall almost all apps in order to gain enough hard drive space to succeed. And forget about code reviews...Visual Studio requires at least 16GB RAM.

But the form factor is great for me.

After another round of uninstalling apps, scavenging for hard drive space, then getting everything working again, I'm thinking about an upgrade.

But what to upgrade to? I wish there was a Surface Go 4 with 32 GB of RAM. Maybe I could get by with 8 GB. But the Surface Go 4 seems kinda old now, and is only available in business editions. Maybe Microsoft is phasing out 10" models? Or if I wait maybe they'll offer a 10" model with at least 16 GB or RAM?

What would you suggest?

Edit: Go instead of Pro