Question about the herpety herps?

Okay so a few nights ago I started experiencing pain when trying to have sex with my partner. I thought it may had been caused because my vagina was just sore. The next morning the pain was a bit worse & it was itchy as well. I believe it was either that night or the next day I had experienced flu symptoms. Talked to my mom said it was probably a yeast infection & maybe I had caught what my dad had had a few days ago but scheduled me an appointment anyways. The next day (my appointment) I discovored white bumps they didn't hurt my vagina however did just because it was raw & itchy. They doctor took a look & I did indeed have a yeast infection. He said that the bumps could be herpes but did not look exactly like herpes (waiting for the results) I was obviously extremely scared. This is the first time I have ever in my life had any sort of problems down there. I have been with my boyfriend for 5 months & we do NOT cheat on each other. My doctor gave me a pill for my yeast infection & Zovirax ointment for the bumps which is given for herpes. It took literally two days for all of this to disappear afterwards except for one little thing, I have this light brownish watery discharge with no smell it was much much worse before but it's almost completely gone. I've heard that it is possible to get bumps with sever yeast infections but I really would just like your opinion. Please don't be rude.