This is a very dynamic situation. I'm not going to fault the guy for trying, but he is obviously out-gunned. Everyday he avoids U.S. custody is a win. Personally, I think there needs to be greater efforts made at home to protect his status as a whistle blower. The current administration obviously isn't losing their interest in getting him. Perhaps the next one will be different (not holding my breath).

Flag waivers aren't going to mind because the government is "just trying to keep them safe".

Regarding Russia, were Russia going to grant him asylum they would of course want to smooth it to the greatest extent possible, so it's entirely possible the earlier dance was a part of the show (Russia showing itself as a concerned partner, perhaps hoping for some American demonstrations of overreach that would legitimize the asylum request, such as attempt to harm or abduct Snowden). He is in Russia, so neither side has any need to rush things.

Not saying it's all a part of some brilliant plan, but things seldom are as straightforward as they seem.

And the damage was made by US government alone. The leaks were small enough to just let the whole thing die down. But by wasting enormous amounts of diplomatic efforts and capital they managed to lose face in front of the whole world.

I assume he didn't expect US would invalidate his passport that quickly, and get stuck in Russia. He wanted to flee to South America (Ecuador, most likely). But then he got stuck and Russia, and now he needs to adapt accordingly. Getting stuck in Russia wasn't in his plan, I believe.

He should have. In fact, the US were incredibly slow in doing it- they could have stopped him travelling to Russia in the first place.