You might as well have said, "Dear God, please save us!"
Sorry, but you won't be saved by any corporate entity; they're in bed with the surveillance state anyways. It is people like us, yes, you included, who have to take up the baton and run with it.
Here are things you can do:
- Talk to your non-techie friends, and bring them up to speed
- Explain to them why "giving up rights for temporary safety" doesn't work
- Tell them why this sort of surveillance is against the core democratic principles this country was founded on
- Suggest to them that they should vote out any politician who supports such policies. In the end, it is the Congress' job to keep checks and balances; and they've failed miserably. Time for all of them to go.