It seems like a false choice to say those are the only two options. Being comfortable in China and Russia implies he had contacts there beforehand, and that wouldn't make him a whistleblower it would make him a foreign agent.
I'm not saying he didn't reveal some important stuff to the public while working as a government contractor employed by the NSA, just that I don't think he's a cool person and I understand why people don't trust him.