Id go for the second text with a "I'll ring you in the morning to compare hangovers haha xx" on the end.
I'd also perhaps forewarn your mates that hes hinted he might accidentally on purpose bump into you. If he does turn up maybe give him a quick hello, get the girls to drink up to go to the next bar and give him a sweet peck on the cheek and tell him again "ring you in the morning have a good night" and peck him on the cheek ie. keeping it all light and breezy but reiterating that you will speak to him on the phone, not in person, the next morning.
I will add what Cogito said about him not being the one for you. They only get worse, trust me. I had an ex who was the exact same. I worked in a pub a couple of nights and hed be at home waiting for me when all I wanted to do was go to sleep as I had my other work the next morning, or worse he would come to the pub (on his own) and get all funny if one of the regs was a bit friendly. He also turned up wherever I was out with friends so they stopped inviting me because it always got awkward if some of the single ones wanted to talk to blokes (hed start an argument about my friends being "man eaters" 
and how if he wasnt there Id be led astray.).
The best one was when I had a work do at a really posh hotel. All expenses paid, but we had to share rooms to keep that cost low. I was in with my 'best' work pal (a girl) and when we all went down to dinner HE WAS THERE. Hed booked a room and dinner for one and said he would just go upstairs to the room to watch TV until the party had finished, he said hed done it because he knows I wasnt keen on sharing with someone from work (err.....actually I was a bit childishly excited by it 
) and he thought it would be nice.
In the end I finished him when Id been to my brothers for a few beers an a sob fest down memory lane over a close family memmber who'd recently passed. he turned up. He knew Id gone for a bit of quality bro/sis time, and it made me realise that he was going to be jealous over absolutely anyone, and controlling of everything I did eventually.
They are crafty, these types, make you think all they do it is for you, to keep you happy, "why are you so upset with me, I love spending time with you I thought you'd be happy Id done it", so they make you think they are just trying to do what they think you want. WRONG!! They are on their twatjourney, they soon start asking "oh, so you are wearing that top then"......"why are you putting make up on you're lovely the way you are"....."have another chocolate (if they want to make you less attractive)" or the opposite "you're having ANOTHER chocolate? (with mock comedy horror but it plants the seed in your mind that you maybe should look at losing weight).
I can see all the hallmarks of this in your posts. I do thinnk you should ask yourself if this is what you really want for your future, because they dont get any easier going, they get more anal and controlling the more they 'love' you.