herpes or bad yeast infection?

I was diagnosed with a yeast infection in june and again in september.

I have had unprotected sex with one person, who told me he was clean (yes I know, unreliable)

Recently, I got really itchy again and have been having all the yeast infection signs- chunky white discharge, redness, itching- but I also have some tiny bumps right around my vaginal opening. I don't think the bumps look anything like herpes sores or warts- they've been there for a couple weeks now, and don't pop (I tried). Right around my vaginal opening is very tender and sore especially in the areas where the bumps are.

if you look at this link, the bumps are where the two little red spots are next to the vaginal opening
http://en.wikipedia.org/wiki/File:Vaginal_opening_-_english_description.jpg

(also the bumps are nearly symmetrical on either side if that means anything..)

However, the bumps came before the white discharge and weren't really itchy just painful to the touch.  I went to the doctor again and had them do a whole slew of std tests as well as yeast and bacterial tests and am waiting for the results.  

I was wondering if this sounds like herpes or just a bad yeast infection and if anyone could tell me why i've had so many yeast infections all of a sudden!

[gracefromHHP]

breaking the yeast infection cycle isn't always easy. you were seen and they didn't think that this was herpes correct?

grace