So I never had my symptoms go away, and endo can affect fertility, but doesn't always.
My thoughts on the surgery are this - all surgery causes scar tissue. Scar tissue can cause more pain than what you've already had. Since it's not urgent for you, and since nothing would really change for you with a diagnosis of endo - you don't really need treatment, you aren't trying to get pregnant at this moment, and you're feeling okay, personally, I'd cancel the surgery.
I had endo probably from the time I had my first period at 12. I had my first laparoscopy in my 20s, and had 3 before getting an official diagnosis of endo at 32. I finally got a doctor who said no more surgeries. Because the endo was so bad, I had adhesions from endo and scar tissue, plus severe ovarian cysts and some other things, I had a hysterectomy in my mid 30s.
I say hold off on the surgery. It will always be there if you need it later. Lots of docs will also diagnose you without surgery, and treat presumptively to skip unnecessary surgeries.
Just my two cents, and it may not even be worth that lol. Give your doctor a call and talk it out. Let us know what happens. :)