oh man, i really feel for you.
you kinda fucked it up by that half-coming out, but i understand why you did.
basically, two things come to mind:
1) your personal life and work life are (should be) separate
2) there should be laws in the company against homophobic behaviour
Strategically, you are lucky that your manager knows and ison your side. But then you lose points by showing vulnerability to the idiot homophobic prick.
I'd advise you to keep the relationship with this person as strickly professional as you possibly can (even though I can understand it might not always be possible). On the side, I'd advise you to get informed about every law that is on your side, so you can use that card if things get nasty. Also, be sure to tell your manager everytime the other guy is an asshole to you, because then you will have build a history when (if) things really do go bad.
I think that's more or less all that you can do right now. On a personal level, I don't know what advice to give you to put up with that shit, except that, knowing ENTJs, I think most of their outward talk is more banter than true belief, so I guess you should learn how to shrug it off.
Just try to spend as less time with this person possible and try to remain professional at all times. Get the manager on your side and keep on storing proof so If things escalate, you can have back-up and get him fired.
Sorry, I feel for your situation. Good luck, strength!