[911Freak]

I've suffered similar issues off and on for years. I attack it from several aspects:
1) Ive found Activon (makers of annoying commercial Head On) to work very well. Try to get the green or blue labeled stick. Work it in well to affected areas, I repeat several times a day. This stuff is great, more effective then RX meds in some cases!
2) good shoulder and back massage, at least every 2 days followed with minimal activity for next few hours allowing muscles to relax.
3) stretching the shoulder, neck, arm and upper back muscles as much as pain allows, preferably after warm wet heat or hot shower
4) RX pain meds work OK for break through pain, as well as a good muscle relaxer like Soma
5) watch your posture, sitting at a desk working on computer is great way to agrivate these shoulder muscles...
Repeat as necessary until better...
Hope you get well
Good luck
Jason