The FBI should be shut down completely and started up again from scratch. The same goes with the DOJ and the Intelligence Agencies.
The IC should be put under DoD. If you have Flag Officers in charge and rotating every couple fo years I think it would put a serious damper on shenanigans.