Vaginal Discomfort, swelling, sore bumps, sometimes itchy, burns when I pee

Hi, I'm SO embarrassed to say this.. I've had 2 sexual partners. Once with my ex boyfriend and my present boyfriend now. I've been with my boyfriend for two years and have never cheated or done anything with anyone else. For the first time I'm experiencing really odd symptoms and am really scared.

We had sex and I wasn't wet after a while and we had to stop because it was painful from rubbing so hard.  It gave me this little bump on the very end of my vagina on the edge of the lips where they meet. It hurt to pee and was really uncomfortable. Well about two days later I got this bump not in my vag, but I thought it was an ingrown hair. thats what it felt like. So I just didn't really worry about it. after about 3 or 4 days without having sex, i still had that sore on my vag, but it didn't hurt as bad as it did before so my boyfriend and I had sex again. It was fine. We had sex for about an hour and it started to hurt again so we stopped. I had him look at it and He said my vag was swollen and I had like an ingrown hair next to it, like I thought. So we went to bed and it just felt uncomfortable and sore. I took a shower the next night and shaved since i havent for a few days and after and when I woke up the next morning I had a bunch of those bumps like the ingrown hair I thought I had! I can't see them because of where they are at, but one of them I can see doesnt look like a pimple, its a tiny bit red but is mainly the color of my skin. They itched a little bit but when I scratched it it really hurt! So is it an ingrown hair like i thought? or herpes?

I talked to my dr, she is also really close to me and she said it might be a razor rash? I shave upward. or I do have ingrown hairs. I'm really really worried. My boyfriend and i live together. we havent been with anyone else. please let me know!! PLEASE!!