I get the impression that the scandal is focused on Snowden (and his whereabouts) rather than on mass collection of data. But this is just my opinion.
So basically, your point about the focus being drawn away from the NSA itself seems correct to me.
Here's a better source: http://www.guardian.co.uk/world/the-nsa-files