That's trying to unbake the cake. This technology will not go away. The powerful will use it in secret; and sometimes the less powerful too.

I'd rather see surveillance first pointed towards government leaders, and then once the government is highly surveilled, then maybe we can trust the government to surveil everyone else.

I don't know. My idea here isn't very realistic. It's not going to happen (though we should still try), so maybe just outlawing all of it would be more realistic.