That genie is not getting put back in the bottle. What we need to do is have laws which protect us against not only government surveillance but company as well

That genie is not getting put back in the bottle. What we need to do is have laws which protect us against not only government surveillance but company as well as private individual surveillance. Government surveillance is but one aspect of surveillance. One way to mitigate the effects is to dull the effects legally. The day will come when not only governments can snoop, but just about anyone who wants to and has means will be able to; so just preventing the gov from doing it will be at most a pyrrhic victory. But you're welcome to try but you won't stop foreign governments from their abilities to snoop on you. Eventually we'll just have to live knowing just about everything about us is known but that that knowledge cannot be held against the individual, in a legal manner. I don't think the cold-war tactics of escalation and countering with new measures is the ultimate outcome.