How did the doctor visit turn out?
This sounds far more like HSV 2 than HSV 1. Genitally.
It is likely that you are still shedding some HSV 1 even after all these years.
You need a herpes western blot
And you need to be swab tested when you have what you think are HSV outbreaks.