This has been discussed before, but a political problem requires a political solution (cessation of surveillance through legislation and holding violators to account with imprisonment and fines.)
The problem is that political solutions become a political problem to those in power, who then impose their own political solution thereto.
The USA Constitution makes it completely clear: "The right of the people to be secure in their persons, houses, papers, and effects, against unreasonable searches and seizures, shall not be violated, and no Warrants shall issue, but upon probable cause, supported by Oath or affirmation, and particularly describing the place to be searched, and the persons or things to be seized." This became a political problem for the powerful, so they concocted a legal notion amounting to the suffix "unless the search is imposed on everyone without particular cause" which has proven surprisingly effective and acceptable to the general public.
When all branches of government conspire to ignore the rules, more rules won't stop them.
The problem with political solutions is that politics change. We need both a political solution and a technological solution. As an example, legal protections for people who run Tor exits or anonymous remailers -- the technology would help protect us from future abuses by the government, and the policy would help get the technology widely deployed to the point of being impractical to shove back into the bottle.
How is this going to work, if, in case you would be trying to be a politician yourself in order to fight the injustice, by the time you have any influence, you are already motivated to increase the surveillance, not cease it. Problem is much deeper than "political misunderstanding" between the people and the government.