Yep. That's an episode I usually skip on a rewatch, and you nailed all the reasons.
I really liked Carter's eyes at the end, when she was standing in the gate room staring disbelievingly at O'Neill.
O'Neill seems to be getting more and more rash. Like, he no longer gives a shit so he's just going for it.
And now I have a question. What is the deal with Teal'c jaw/cheeks trembling like there's butterflies wedged into them? Is he grinding his teeth?