definitely do any stretches you can. i fractured my L4 and had to wear a back brace for so long and had to wear it 23 hours a day it sucked and i have scoliosis too so i know where youre coming from. stretching and heating pad definitely will help you out!
I've surfed with chronic whiplash for over two years. I recommend Ibuprofin/plenty of water before you go out or after depending on the length of your session. I've found that a combination of proper diet, strength training and cardio, yoga(more importantly stretching your back/neck) will give you some relief later when you're out of the water. At least it does for me. I also hang from a pullup bar and let my back stretch out that way. Still a little stiff from time to time but it's better than it used to be. One of the most important things I tell myself when I surf is to not tense up and relax while I paddle. Hope it helps.