I need to find out what this is... please help!

[Alwaysill]

I've been diagnosed with Vaginal herpes and I got my first outbreak back in January, there were a lot of sores inside my labia minora and vaginal entrance I took Aciclovir tablets and it cleared up within a week. Last Tuesday I had sex with my partner and it wasn't particularly rough but I wasn't well lubricated and was painful and difficult when he entred me. After sex I was very sore and it burned when I urinated. The next day the pain was still there, in fact it was worse. The pain was coming from the perineum and the fourchet, it was so sore and burned like nothing I had ever experienced when I urinated. It did not give me any discomfort other than when i went to the toilet and when I touched it. 3 days later the pain was still there and I got my partener to have a look what was going on, he said it was red raw and there was a tiny cut and a tiny sore with a white head on it. He said it looked nothing like my herpes outbreak I had before.
Could this be herpes? Does herpes reach that far back? Do you  have to have apparent ulcers to be herpes? I tried putting some hydrocortizone cream on the area as I researched this would help but this make the stinging worse.
The next morning, I found a small sore on my right labia majora that had a white-ish yellow-ish head and was very sore to touch. Again, my parner says it looked nothing like my herpers outbreak. It is now 6 days since sex, my right labia majora is now swollen and clothes are iritating it and making it even worse. It is still extremely sore and not healing at all so, I have started to take Aciclovir again as I have been researching and I think perhaps it is a herpes outbreak. What do you think this could be?