Hi Lisa 
What a positive response to your visit with Dr Diamond, good for you! It seems that we had similar discussions with specialists recently! I travelled to Sydney last week to speak with Jason, from the team of specialists at the Endo/Gyno clinic at the Royal Hospital for Women in Randwick (Sydney).
He understood my not wanting to rush into more surgery, and that the surgery I had in April to remove my ovaries did in fact solve one of the particularly nasty pains for me. I was well aware that I would still have pain after this surgery, so didn't at all feel cheated in that sense.
My intention in visiting the clinic was to gain access to the excellent facilities and professionals associated with the clinic. I now have a medical team working on a long term pain management plan for me, and I can tell you this gives me a great sense of relief!
I will have consultations with a pain management specialist who happens to mostly deal with cancer patients and is very good at listening and offering advice on diversional therapies. She also explains how different pain meds work and which ones work for different types of pain etc.
I will also be working with the incontinence physiotherapist, to help me learn to "relax" my pelvic floor muscles! I mean, trust me to need the opposite to what most what most women have to learn! Pelvic floor exercises to strengthen them.... I have to learn exercises to "relax" them! 
The longer I can put off another visit to an operating room, the better!
Love & warm gentle hugs
Jo(Australia)