I also believe mass surveillance is inevitable as the cost of cameras falls to nothing. Once there are drones/balloons for $100 that can monitor a square mile, they will be everywhere. And even if the government gets stopped from using it, private businesses and citizens can't be stopped.
Our only hope is to fix the government so people are not put away for acts that shouldn't be crimes. Let the brunt of this technology fall solely on violent criminals and thieves.
I think the best we can do is to get transparency and at best to subject the authorities to the same level of surveillance.