Herpes Results

Scenario-  I haven't been sexually active for nearly five months and recently entered into a new relationship a month ago.  During the time of my new relationship I developed a small ingrown hair in my pubic area just above the base of my penis.  I've noticed these before and besides a little soreness, it goes away in a few days.  This time it became infected and as a result my lymphnodes became swollen, I actually thought it was a hernia and went to my doctor to check it out.  She told me it was my lymphnodes and that it was most likely from the ingrown hair infection (which she agreed it was and not an STD blister or sore).  I did decided to have a routine std test done, as I haven't in the past and wanted to be responsible.  

A week later the doctors office called and said I tested positive for Herpes, but they did not know which type it was based on this test.  I'm assuming it was an Igm test, from what I've read this test does not distinguish between the two and I have not yet received my test results in the mail.  It was actually the doctors assistant who called me, and she said I needed to come back in a month and be retested for type 1 or 2.  I asked if the second test results would determine if I had herpes or just distinguish one or two type, she said I infact HAD herpes and the second test only distinguishes the two types.  This is very concerning as I have only had a few partners, always use protection with no concern of transmitting a STD.  She also told me that I shouldn't be concerned about continuing my sex life as long as I use a condom.  

My questions are:  Should I inform my current girlfriend of what I'm going through or wait for the next test?  How long does it take to have the first symptoms?  I'm currently on an antibiotic for the infection, would it be advised to go get a second test done, this time an Igg test done somewhere else to know for sure?