You're hiding too many things, I think. You want to be with him, and you want to be WITH him -- he knows the first, but not the second. I think you need to start letting him know! And about the homophobic thing, ask him if he really meant that, 'cause you're gay, and it makes you uncomfortable hearing that. And that topic could be a lead-in to mentioning the old, and never-dead, crush.