Help me!

I had really rough sex and I believe it tore my vagina a little. Now I have little bumps that are swollen and itch. I had a yeast infection a week ago. Could this just be a worse yeast infection or possible herpes? The guy says he was clean, but I'm still really scared.