Hello, and I hope I can help you today.
Folliculitis can definitely happen in the genital area from shaving or waxing. Usually the best way to treat it is with antibiotics, but pills work better than cream.
However I am concerned that you say the symptoms have moved to the opening of your vagina and that you have pain with urination. Folliculitis by definition is an infection of your hair follicles, so they should not be anywhere on your skin that has no hair. Also pain with urination is not part of the symptoms.
I do not want to alarm you, but I am afraid you may have been misdiagnosed and may have another problem. I do not know if you are sexually active, but
genital herpes can present like this. If you google genital herpes women, look at the images and see if the bumps look anything like the pictures. Either way, I suggest you see a GYN doctor for a repeat examination because folliculitis shouldn't spread and your pain with urination is not normal with that condition.
I hope this information was helpful and that I adequately answered your question. Best wishes, Dr. Brown