Hi. Please Help. I Thought I Had Yeast Infection, Itching,

Hi. Please help. I thought i had yeast infection, itching, discharge, i am prone to it and can get ot upto 3 times a year. In the last 5 months ive slept with 2 different men, without protection, the first was only a couple of times and he didnt actually ejaculate nor did i notice anything abnormal. The second is developing into something more serious and after we were sleeping together for about 2-3 weeks i started having symptoms of what i thought was thrush as we were having a lot of sex due to it being so new. After not really stopping myself from continuing having sex, i found i was still irritated so just thought thats why and i should take a few days to rest. After a crazy night we both became very sensitive and last night i saw he had 3 burn like marks on his upper penis below the head. Which i firstly thought were friction burns because there was a couple of rough sex when i was quite dry and we didnt use lube. But i also started having a lot of pain and all day have been peeing very frequently and it has been a horrible burning. After so much think oderless discharge i took a shower and took a mirror, to also see that i too have what look like friction burns generally on the right side of the vagina, 2 or 3. My new partner says its the first time this have appeared and its my first too. Is this still possible to be a yeast infection i have passed to my partner or something less fatal and dramatic than herpes? Thanks in advance