I still say that the best way to fix this country is to start by rebuilding the Secret Service and adding an auditing division to it. That auditing division would then audit the NSA and immediately absorb its assets. Then, it'd turn them on the FBI and CIA, both of which would be encouraged to rat on eachother's misdeeds. Then you roll the CIA into the State Department (after a full audit over there, too) and split the FBI in two, giving Congress the ability to order their own teams of handpicked investigators to constantly audit eachother, and the actual crime investigation aspects of the FBI go back to the DOJ, after it is also audited. For good measure, antiterror assets in the FBI should be handed over to homeland security.

The goal would be for the CIA to have literally zero domestic offices, but the ability to operate out of our embassies and consulates with near impunity, because fuck the world. Simultaneously, the government's spy tools would get turned on the government, and McCarthyism would be encouraged. Congressional gridlock would ensure, and the people would be so disgusted that the parties would have to change for the better.

Or, any attempt to change anything at all would be met with assassinations, as it has for a century or more.