Any cryptographic application could be vulnerable and not "hold up". It is wrong and dangerous to suggest that any program or tool is absolute. A court case in Germany not long ago involving RetroShare and its f2f nature did not end well[0].
[0] http://torrentfreak.com/anonymous-file-sharing-ruled-illegal...
I think it actually did end well. The guy was acquitted last I heard. I don't think their changes held up in Court.
> for the time we need to "undo" the mass-surveillance apparatus
You mean the apparatus that the vast majority of Americans are probably unaware of, and the vast majority of aware Americans are probably proponents of? What makes you think there will ever be an undoing on any reasonable time scale?
I mean, encryption could still be the one tool needed just to get activism going enough to beat the bastards (I mean, without being sabotaged, disinformed, killed, arrested, etc.).
Snowden's statement regarding encryption was: "Encryption works. Unfortunately, endpoint security is still weak."