Itching and whitehead like spots appearing on ?

I'm 17 and i have regular with my boyfriend who has had no previous ual partners. Recently he shaved his pubic region and the friction i believe is what caused my labia to swell up and become unbearably itchy, also he has complained of a bit of itching from it. The itchiness seems to have been moving upwards (from lower area surrounding l opening to area surrounding oral hood) and i shaved off some of my stubbled pubic hair to discover about 5 spots that are almost whiteheads surrounding my lower lips. (like everything below the pubic bone). What is this and how do I treat it? Also is it my boyfriends shaving that is the problem?