There are no total solutions for the surveillance issue just like there are no total solutions to the piracy issue. You can't put the cat back in the bag without walking away from having an Internet.

At the end of the day, this is a social issue not a technological one. Our only hope is to hold our leaders accountable and help saner heads to prevail.