Thanks for all your feedback. My sup is known for being quite edgy. I guess I'll just let it roll off from now on. I have to remind myself that it's not me, that he's got other pressures weighing on him. Maybe I've been taking it too personally.
Problem is, even if the sup is absolutely great, nice, friendly, constructive, supportive, the question arises whether (Ph.D) research can really be fun. It sucks, IMO.