The problem with surveillance is actually not the surveillance itself, but inequality in its application. This has been true for a long time; before the Internet age people with power just built higher fences

And so, there are two distinct solutions: (a) make privacy cheaper and more accessible (b) apply radical openness to everybody, both haves and have-nots. Second solution has been overlooked somewhat and it might have some useful side-effects like reducing amount of resources spent on pointless competition and zero-sum games