This is a good start, but in the end the NSA can bypass any of these measure if needed (even the cryptography). The only think that really can change this situation is a protest versus your political representatives.
That said if they knew a way to crack AES or RSA it would be a different story (a nightmare).
[1] http://blog.agilebits.com/2013/03/09/guess-why-were-moving-t...