I read your detailed history & note your clinical features.
Relax, from all that you describe, it does appear that either there was a trauma during shaving the region & /or there is an ingrown hair that is the resaon for the 'bump' appearing.
Your boyfriend's close attention to the region will have further aggravated the issue. It is unlikely to be an STD
per se. Please do take an antibiotic metronidazole
based along with an antiinflammatory eg. ibuprofen
both in a 400mg dose three times daily with of course the prescription of your GP & things should sort themselves out in 48 hrs. If in 72 hrs, there is no respite, then please do go visit your gynecologist/dermatologist
Dr Praveen Rodrigues MD