For myself, I'm thinking O thought he had dressed NSA as legal lamb, but everyone can tell it's metastasized mutton.
To change metaphors - the trick is to redesign the programme so that it fishes from the digital ocean rather than trying to swallow it.
Don't store metadata. But require companies to maintain it for a couple of years and then streamline probable cause exceptions where necessary.
Only gather keys and listen to conversations on the basis of reasonable grounds for suspicion.
And otherwise, secure the heck out of the internet.