Oral sex, razor burn, herpes?!

Two weeks ago I shaved my pubic area and that night my boyfriend gave me oral sex.  While he was doing it, I felt an uncomfortable friction around my clitoral hood and right above it, where hair normally would have been.  A two days later I saw bumps, some bigger than others, and it began to itch.  I thought it was razor burn- the itchiest, most uncomfortable razor burn of my life.  I removed the ingrown hairs out of the smaller bumps and they faded away.  But one bump that I messed with, located on the inner front part of my labia majora, looked most like a pimple.  So I popped it.  Since then it has turned into this abrasion.  Just like, a raw cut.  Then it formed a scab of clear, yellowish hard stuff which I picked off trying to find an ingrown hair.  And it itches.  There are three other bumps that have not gone away.  They are the ones that were "bigger than others".  I picked them a lot so they formed scabs.  I picked the scabs off trying to pop them, expecting there to be a pimple and hair lying beneath the scab causing the bumb.  They have not rescabbed.  It really just looks like razor burn, but it itches.  And when I wipe after using the restroom, the raw cut hurts.  I am having to work around it sort of.  I really thought it was just the worst razor burn of my life, but everytime I think the itching is gone, it comes back. and the three bumps are still there.  And the raw cut hasn't healed.  I was going to put indian salve on the whole area tonight, but decided not to just in case that would be bad for it. And I started my period five days early, if that has anything to do with it.  What is going on here? Is it just razor burn that I have irritated or is it herpes? I've never had an STD before so I am freaking out.  And I have a whole two days of waiting until I can go to the doctor. Help!!