Saphenous Nerve Entrapment

I have been dealing with left knee pain for nearly a year. After two MRI's (both "normal), three orthopedic surgeons, active release techiques, cotisone injections, physical therapy and being told I have every knee pathology under the sun, I finally recieved a legitimite diagnosis of the entrapment of the infrapatellar branch of the saphenous nerve. I had been dealing with medial knee pain and numbness across the front of my knee and my family doc nailed the diagnosis when I was injected with a dose of local anesthetic into the nerve. The pain subsided immediatley, but returned within a few days. The doc told me this injection was purely diagnostic and that the nerve entrapment would have to heal on its own, which can be a rather lenghty process. My question is, has anyone else had this same problem and if so what was your treatment and recovery time. I can only hope there is some sort of treatment other than just time.