Let's hope good old physical therapy and muscle strengthening will do the trick.
Surgery = absolutely the last option...and if it is suggested, get not 1, not 2 but 3 "second" opinions.
If it's just buldging exercise and time is the best treatment - or so I have been told by a number of specialist treating my DH.
Good luck to you and I know what you mean about finally having a diagnosis to put with the discomfort. Pain, being subjective can be so very frustrating to get people to believe what you're going through.