Right on. The way I always saw it was that the NSA were the thieves, collecting data they did not own. Snowden, while accused of stealing secrets, actually set them free.
If I remember correctly, Snowden himself said in Citizen Four that intelligence agencies use aliases for assets and not targets. Which would mean that if any agents had actually been named in the docs, their masters saw them not as assets but as potential targets, which is damning unto itself.
The talk of need for separation of Church and State is one thing (and absolutely valid), but I think the largest threat to the world, indeed the largest threat the world has ever known, is the marriage between (American) State and (American) Industry. That's what the Snowden leaks have verified most.
It's the Department of Homeland Security's responsibility, but that doesn't mean that anyone necessarily failed at their job. Just that it's a very difficult job.
The NSA will certainly contribute tools and expertise when needed to any US government agency/department.
The DHS tool "Einstein" is an intrusion detection system that detected the breach.
CIA records are assumed to not be held by the OPM, for the reason that they are the ones that are most sensitive if stolen.