What needs to happen is for the CIA, NSA & FBI to be turned into training commands. They can offer services like fingerprint analysis, domestic surveillance, overseas surveillance, asassination, eavesdropping, hacking, etc. Then various joint commands responsible for threat areas, such as the southern border, the northern border, homegrown terrorism, etc. would draw on these services as needed to address their threat areas. This would get the CIA management out of the policy arena altogether. How much demand do you think there would be for CIA analysis capabilities?
I like your second paragraph very much. Sounds like something for our next president to consider.