Honestly, at this point, the only solution I can see is to end the NSA altogether. It is clear that it cannot be in check. It is also clear that it mocks rule of law. If the US still likes to call itself a country ruled by law, this is one of many necessary steps at this point. Otherwise, let's call the situation as it is: we do not live under rule by law. It seems that the ambiguous wrath one faces when pissing off the king (NSA, gov't, big corps) today is no different today than it was under feudalism and that in fact, while other countries actually make an effort and succeed at being ruled by law, the US is not even making an effort. And we have the gall to call out other countries on their human rights abuses. What a disgusting, primitive, uncivilized, and sick country the US is these days.