I believe you're right. Almost every article with NSA in the headline that I've seen also has Snowden, or Ecuador, or Russia.

So basically, your point about the focus being drawn away from the NSA itself seems correct to me.