How to deal with an advisor who wants a "friendlier" relationship with me than I do?
I don't know if a meeting at which you "set the agenda" would be particularly helpful at this stage. It might make him feel "attacked", put him on the defensive, and he may retaliate against you in response. (I'm not suggesting that he would try to get you kicked out of the university or the department; there are many, many other small and large ways an advisor can make things difficult for a student. You already suggested that when he's mad at you, he deliberately ignores you emails, for example.)

I strongly disagree with the advice to flaunt a (real or fake) relationship, to let your advisor know you're unavailable. I've seen people try this, and in my experience, when applied to someone who does not respect boundaries, the outcome is often that then he starts asking you a whole lot of very uncomfortable questions about your boyfriend and the relationship. 

Also, he's probably doing this because he enjoys it (flirting, the chase, whatever), not because he wants an actual committed relationship. So I'm not convinced that he would be dissuaded by your unavailability.

Instead, I suggest you start using a variation on the following phrase to respond when he does something that makes you uncomfortable:


  I don't want this. This makes me really uncomfortable.


As in, 


  I don't want you to take my photo. Please don't ask again, it makes me really uncomfortable.


or


  I don't want to talk about my personal life with you. It makes me really uncomfortable.


etc.

And, if he persists in whatever is making you uncomfortable,


  I need to go (get a cup of coffee/make a phone call/talk to another student before he leaves for the day/make some photocopies/etc.)


then remove yourself from the situation.

I recommend practicing saying these words on your own, until they feel natural. This will help you feel less flustered when a situation comes up.

I also concur with StrongBad's suggestion:


  I would suggest the OP writes down every time she tells the advisor he made her feel uncomfortable. She should also keep track of times he makes her feel uncomfortable in which she was uncomfortable telling him he made her feel uncomfortable. 


and I would add, also make a note of who else (if anyone) was there at the time.

This will help in two ways:


You'll be able to tell if the situation is getting better or worse with time.
If you do need to escalate at some point, you'll have some documentation.