I’d stick with samsung, I believe ultras have 1Tb options, but mind that better phone with bigger sensors and 4k video and such, will take even more space. I cloud sync everything, so I’m fine with my 128gb S22. I use the very good integration with onedrive. I understand your point on being internet dependant but for my experience files don’t take too much space so they’re always with a local copy, and as for photos I keep the ones from the past year or two, the older ones are always available in low quality, so it’s good enough for a quick check
they are together as off some updates ago, so probably the one on the store had an old software version