I second all of what you wrote. I was gaping at the screen when I saw how John manipulated Wallace, because no matter what John says, he did talk Wallace into killing himself. He didn't just present the facts, he knew what he was doing.

I also adored all the McKay/Sheppard moments. John loves Rodney so much, and it makes me very happy. I wished Teyla could have been there too though.