When the guy brought it up the first time you met him he was giving you the opportunity to tell him to stop. You didn't, so he is assuming it is still ok. So far, I really think this is just a communication issue. Stay cool, don't let this drag out cuz you will just get more pissed and chat with the guy.