Thinking back on the scene and having read a lot of peoples' reactions/reviews to the episode, I think you're right about both Dean and Castiel. Just quite the rough road on the way back, that's for sure (and dang if I don't love it as much as I flail about it :x )