It's probably somewhere between the two, isn't it, really? Jack drinks when he isn't so intent on keeping a clear head, but his life is such that he can only really let his mind wander when he's traumatised, and needs to.

It's fascinating that they've made a character who's only seen drinking water, yet they haven't commented on it (that I've seen). I wonder if it'll get expanded on.