What Is The Treatment For Swollen And Itchy Labia Majora?

Hi, my right labia majora extremely swollen, sore, red and itchy. I had a bikini wax 4 weeks ago and thrush about 5-6 weeks ago. I used cream which i thought cleared it, but about 2 weeks ago when my labia majora started to swell and itch, i started using the cream again. This seemed to make it worse, and after about 4 days of using it day and night i stopped. Since then my labia majora has become increasingly inflamed. Also have 3 brown mole like marks, also on right side, not on labia, but doctor said they look like discoloured lesions. He also said labia looks like the result of a bad wax and trapped bacteria, as I havea swollen gland on right side of groin too. Please please help as it is so uncomfortable, sore and increasingly getting worse. I have sat in salt bath, used aqueous cream, ate and applied natural yoghurt. I'm scared it's viral like herpes or something. Please advise