Hi there Carly.
It does appear from your history that you ail from some sort of fungal infection
& you need not necessarily manifest with a discharge.
Is there any tenderness of the region? From your description it appears itchy & due to scratching, possible to have got secondarily infected & hence swelling.
Please do use a topical 2% ketoconazole
cream sparingly twice/day for 1 week or so.
In addition you mayingest a single time dose of a kit containing 2Gm tinnidazole & 200mg fluconazole
but this may require a prescritpion from a registered medical practitioner unless your pharmacist is a kind man.
This should help clear your issues. Should it (the itch) persist inspite of this treatment for more than 72 hrs after oral treatment as suggested, then time to go visit a dermatologist
on the ground near you!
Remember to treat your partner similarly at the same time & also all your undergarments & towels & fomites!
Cheers & wish you a great sexual life & good health!!
Dr Praveen Rodrigues MD
Dermatologist, Cosmetologist, Venereologist
Vikram Hospital Bangalore, India