I've been saying this since the Snowden revelations came out...
Check my posting history if you must. The U.S. Cyberwarfare Command needs to be moved out of the NSA and Fort Meade. GCHQ has made a big deal about taking over cyberwarfare/defense for Britain, and that needs to be moved into a separate organization. In both cases, the cyberwarfare and defense organizations need to be moved out of the intelligence community altogether.
Otherwise, you are going to see the traditional intelligence community focus on "What system did you penetrate today to get me some good intel on what Russia/ISIS/China/insert-rival-name-here is up to?" will always outweigh the unsexy and unhelpful "Today we validated that the IT systems in the Department of Transportation have entirely adopted encryption of data-at-rest."