Before we do that, let's establish, out in the open, that these laws are Constitutional. The Constitution still matters - right?
I actually suspect that total surveillance is in fact, inevitable. Or possibly already here. All the NSA seems to be doing is pulling together existing digital records. There seems to be little original surveillance if that makes sense.