Damage Limitation
It's clear that the technology to track everyone is now in place, and governments/TLA organisations are reluctance to put any restraints on what they do, so unless the great unwashed can tear themselves away from Eastenders or Coronation Street (don't know what the equivalent is in the states) there isn't a lot we can do about that.
However, having all this information is one thing, having _access_ to this information is another.
The access to such data should be compartmentalised so that it requires a court order to view it, and the search criteria must be clear and precise, i.e. no fishing trips just because some bloke you thought was a terrorist is just a curious scholar so you start trawling his internet feed for fetishist porn sites and get him on some spurious charge just so you don't look like an agency drunk on power and out of control.
You have one organisation that holds the data, with no access to it.
You have a public organisation (such as the judiciary) issue the warrants.
You have one organisation that can access the data with that approval.
Organisations 1 and 3 can be as secret as they like, as long as organistation 2 is publicly accountable for the cock-ups (and if they're bad (like shooting an innocent man for an expired visa) then it means jail time).
This is nowhere near likely at the moment, but it is something I would support. As much as I dislike all this spying on citizens I am a pragmatist, and I believe such an approach could appease both sides whilst not giving both sides everything they want.
The public want no spying, or total oversight of any spying
The agencies want total spying with no oversight
At the moment we are in a situation closely resembling the latter. We need a middle ground to aim for or we'll get nowhere.
I'm not political in the sense I support one party over another, but I do believe in the common good. However, this needs to be tempered with controls on the power that the people mandate their 'masters' with. Otherwise we should just accept that we are living in a false democracy and get on with ratting out the neighbours for letting their cat shit where it likes.