My personal experience was that even with a professional bike fitting and adjustments and swaps, etc. I continued to have neck/nerve problems needing physical therapy treatment. I finally bit the bullet and spent the money on a new correctly-sized bike and wah-lah -- pain went away. I still had to do some swaps (handlbars and stem), but, what a difference the right size frame made!

I'd suggest starting with a professional bike fitting and going from there. Good luck to you!