Yes, you are right to be angry with him. He put you in an uncomfortable and awkward situation and should have apologised by now. You already said he has a history of being like this. He's being selfish and making it difficult, 'cos you're evidently not the kind of girl who leads guys on and gets a kick out of them declaring undying love for her, then laughing at them, or whatever.
I mean, don't get I'm wrong, I'm not saying "Kick 'im" or anything stupid like that, sorry if it came across that way, but I have been in a similar situation and it annoyed me because I couldn't talk to him or anything because I was worried he was looking at me in that way, or storing any info up to make a move.
Were/are you good friends? Have you talked to him about it and said that it's making you uncomfortable and you're not used to it, not interested and you don't want to lose him as a friend?
That's if this is serious, if he was just a wee bitty pished and declaring love randomly, as you do when you get that rosy, happy drunken feeling, then you can just take the piss and laugh about it together.