Whilst I went with the flow on this one, like you I found some things jarring - and half hearted. I read someone's comment somewhere saying these two writers in particular don't seem to have realised that the two men they are writing about have been through a TON of shit since Season 1, so simply repeating jokes that worked when Dean and Sam were ten years younger just sound crass now.