What Causes Swelling Of Vagina After Shaving The Pubic Hair?

I shaved my pubic hair on Sunday night and on tuesday I was reallu sore down there in my private area so on wednesday I phoned my GP and I had to do a urine sample. This came back that I had an infection so I was put onto water tablets for 3 days. One the third day my vagina was so sore that I couldnt wipe it and when I had a wee I cried. I had a look in the mirror and I can see sores that are swollen and my clit is swollen to. I went back to the doctors and said that I think that when I have shaved I have nicked myself and he has put me on 500mg antibiotics for 7 days. I started taking them yesterday... are they the right things to be on? when will I start to feel better. I still cant wipe down there, I can hardelys walk and I cry when I have a wee due to to it burning my sores?