Struggles of herpes

Had a few odd symptoms, put down to thrush, until I noticed one tiny pimple like bump, that appeared over night as I was checking numerous times a day.  The nurse froze it off assuming it was a wart. Few days after I experience a NON text book lump, about an inch in size and in a very unfortunate place, ( literally looked like a third lip ... ) I couldn’t walk, sit, lay, cough or sneeze. I went back and they diagnosed me with herpes, waiting confirmation and assuming they’ll tell me a type.  It didn’t blister, ulcer or open just decreased in size with meds. Started a three a day course of aciclovir. Since the decrease in size I’ve had non stop itching, which I don’t know is an actual itch or in my head, I don’t know if it’s because hairs growing back as I usually shave it all once a week, but haven’t done since.  I have a loyal loving and caring boyfriend, who has no symptoms at all. Over all it’s probably been just under a month with the thrush thought, initial break out and healing. I now have itching and occasional twinges downstairs, this has been on going since the start of the drama. Is this a second outbreak or am I healing ? Took a 400mg dose of aciclovir last night. 

Ps: I don’t need any advice on types I just want to know is this a possible outbreak or healing process.