Have I messed this up for good now ?

Sounds to me that he has quite a bit of baggage. Did you mess it up according to his standards and expectations? Probably. Can it be remedied? Most likely. Honestly though if he can't accept you for being silly here and there then whats the point? He needs to get some help or else he is going to drag you down with his baggage.