Herpes or ingrown hair from shaving ?

I''m 16 years old and about 8 months ago, I got a new boyfriend and we started having sex at least weekly. He likes women to be shaved so I shaved my vagina every week for him. It''s always been quite sore and itchy afterwards. Anyway, we broke up around January but I continued shaving, and about two months ago I found I had these kind of...spots...on my vagina, around where the clitoris is. They were yellow headed, pretty small and painful, and they scabbed over a bit afterwards. I looked them up on google images and it looked like they were just ingrown hairs, so I thought fine, I''ll just leave it then and so I did.
I then ended up having unprotected sex with this other guy, with these yellow headed spots.
Now, I''m back with my boyfriend again, and we had unprotected sex earlier today. I noticed yesterday that all my yellow headed spots have now turned into skin coloured lumps that are small but do protrude from my skin. I''ve looked at pictrues of ingrown hairs on vaginas, and I''ve looked at pictures of genital herpes and I really am not sure which one of these it may be, if it''s either of them at all. I really don''t know what to do, or who to go to. I don''t want to go to my boyfriend and worry him about herpes unnecessarily, and I definitely can''t go to my family, because they''re strict and don''t even know I''ve been having sex.
So, with all this in mind, my main questions are, what the hell do I have down there? And if it''s anything like herpes, will I have given it to my boyfriend, who incidentally has always suffered from cold sores around his mouth (and now I do too because of kissing him)?
Please, please, please help me. It would be appreciated so much.