I've only seen it once, but I'm planning a second viewing this week. And yeah, there were a lot of expectations for me too, but the movie surpassed them, and then some.

Oh, I like your theory about Charles being off his game after experiencing Shaw's death. It explains his weaksauce arguments at the beach better than...well, anything, really.