Myself, I'd propose a battle royale between the CIA and NSA. Do a giant wargame, see which can pwn the other faster/better. Two agencies enter, one leaves.

The surviving agency is then split into foreign and domestic branches, with a sane level of cooperation.