I think you have the right approach. Get the surgery done in your non-dominant hand first. This will allow you to see how long it takes to recover and if you get full mobility and less pain. Definately investigate for someone who specializes in hand surgery.