No, the surveillance is at the core here. People love making pro-surveillance arguments in this same vein by just asserting that there can exist a world where everyone is surveilled but the usage of surveillance is checked and will never cross any line.

That world can't exist. Mass surveillance IS power, and power corrupts. Any situation where the use of surveillance is reasonable is a temporary transitory state, the final end is always the same - repressions and authoritarianism. The technology is a siren song, it's too attractive for bad actors so they will try to get it in somehow. And once your system of checks and balances springs a leak somewhere, it sets in motion its eventual undoing, because there's almost no stopping it once it's relied upon somewhere.