This is like that old story about the bodies in the river, and the city finding ways to organize rescue etc. But nobody asked what was going on upriver.
Instead of finding ways to protect ourselves from government surveillance, we should be focused on how to root out the people doing the surveillance. If the government views us an enemy, how should we then view them?
Good point.