Do I have genital herpes or a yeast infection?

[Ericasta]

I am a man who received unprotected oral sex from another man 3 weeks ago. Four days after that encounter, I began feeling burning during urination, had a white/yellow discharge, and a small rash around the edge of the head of my penis (uncircumcised). Went to the doctor and received a gram of Zithromax and rocephin. Those did nothing to help. He then gave me a 10 day course of doxycycline. That ended 3 days ago. That relieved my burning urination for the most part - I still feel it ever so slightly occasionally (not every time I urinate). Discharge is gone. However the rash is still there. It hasn't gotten better but also hasn't worsened. It's not raised or bumpy. Not scabby or blistering. It is barely noticeable, but when I masturbate, it expands and gets redder. A few minutes later though, it goes back down. I just went to see a doc again and she's concerned about genital herpes but I'm wondering what the likelihood of that is since 1) this was oral sex and 2) my rash doesn't seem to fit the general herpes profile - it doesn't hurt or burn, just feels a little tingly after masturbation. Would love some feedback. Many thanks.