You could have irritated the area shaved area from friction during your night of sex. This can cause the hair that is growing back to start to be ingrown...shaving can really cause ingrown hairs. When you have herpes you have herpes forever...it should have come up positive then. But you should go and have a round of std tests done just to be safe. Your discharge could be the result of a yeast infection. I agree with AnnieBrooke - please don't sit at home popping things on your va-j-j you'll cause more harm than good. Plus, never pop or squeeze. Use a warm wet compress to draw the bump to a head...you can pop and squeeze forever, but if it isn't ready to surface, you are just making it worse.
When you were tested for herpes, were you also tested for trich and all the STDs? If not, please go get checked. It's hard to say by your description what it could be, and the idea of you sitting at home popping zits on your va-j-j is almost too much to consider.