I have had excellent results with my neck and shoulder pain with Viniyoga, a particular type of yoga that is a bit different from what you may have encountered elsewhere. In fact, I find it so valuable that I'm in training to be a Viniyoga teacher (quite a change from aerospace engineering).

Gary Kraftsow (founder of the American Viniyoga Institute) has a great book, Yoga for Wellness, you could check out. Find it in many bookstores, often in the library, or order it online http://viniyoga.com/?cn=what_product_gary.

AVI also has some audio tapes http://viniyoga.com/?cn=what_product_audio

The Viniyoga approach has remarkable success with back pain. Gary has brought Viniyoga into the realm of accepted medicine, and even has developed a series of classes for low back pain as a result of work funded by the National Center for Complementary and Alternative Medicine, and is currently working on a project for the NIH on yoga for anxiety.

As I mentioned, asana (postures) in Viniyoga are a bit different from many other types of yoga you may find in the US. Viniyoga...
1) Uses repetitive movements in and out of postures combined with holds in postures. Repetitive movements help reprogram your movement patterns.
2) Emphasizes function in asana, adapting the postures to achieve particular results.
3) Emphasizes the use of the breath in movement
4) Uses a very intentional sequencing approach that allows a teacher to suit the practice to the circumstances

And, if you find that you like the approach and would like some help, there quite a few teachers in California http://viniyoga.com/?cn=who_directory_teach#California

I also HIGHLY recommend EFT http://emofree.com/. It can help you with the pain and any emotional connections to the pain.

It looks like they have some free basic learning instruction on the site. Learn the basics – it is a sequence of tapping on certain spots along your body along with some eye movements and affirmations. Then explore your feelings about the pain, the accident, the “down-time” that flare-ups cause you, and any other negative associations about the accident and pain. Use the sequence for those feelings.

No one is really sure why it works, but it does.

Good luck with your full recovery!

PS - My friend the health writer would probably ask you if you are getting enough low-fat protien and good fats (cold-pressed extra-virgin olive oil, almonds, avacado, macadamia nuts and fish oil) with each meal - see http://www.undersizeme.com