DS,
I damaged the C6,7& 8 Cervical Vertabrae in my neck and strained my T1&2 Thorasic V in Dec 2006 and couldn't move or feel any of my limbs for 24 hours (was very very lucky not to have been paralysed) and it took three months to gain full range of motion again, so I know the pain it causes.
After MRI confirmed this, I had a load of manipulation and acupuncture with an Australian Physio called Mark Wu and later with a Dr Gipson a Chiropractor (Due to my bed)
So maybe consult one of these (Google SEIMC)
Also try the spot massage at Dragonfly masseur's (65 rmb) and ask them to get really deep in to your shoulder and back muscles, ask them to apply tiger balm during the massage.
Don't do any weights at the gym for a while, but stretch your arms, shoulders and back every morning and night, & hot pack/towel to stimulate blood flow and loosen the muscle tissue.
Try an anti-inflamation medication like Ibuprofen or Fenbid (over the counter) and buy a couple of different density pillows.
My big problem was this professional orthopaedic memory foam mattress that I have here - ITS THE BIGGEST LOAD OF CRAP I HAVE EVER SLEPT ON.
But when in doubt, use your medical insurance and consult a physician.
Good luck.