Here are a few more ideas that you might discuss with your doctor:
1. ultrasound and physical therapy
2. cortisone injections (no more than three in six months) Only allow your doctor to do these if it's the only option you have before surgery.
3. oral medications, including NSAID's and corticosteroids
Definitely try the night splint. I read one statistic that said these have an 80% chance of working.
Try anything non-invasive before trying cortisone shots and surgery.
Best of luck!