You might want to PM Colonel Holman... he's REALLY helpful (thanks, Colonel!)
Otherwise.. the standard of care is ice, rest and anti-inflammatories. The question is... where is the problem? It MAY not be anywhere near where the actual pain is. Hard to say if this is your neck/spinal nerves or in the shoulder, or maybe the radial nerve? If you can pinpoint where it's being "pinched", ice that spot...
One herb that might be worth trying is St Johnswort. While it's best known as a mild antidepressant, it's also useful for nerve pain. Be aware that it can cause sun sensitivity, and use sunscreen when outdoors while taking it.
Also... look into "trigger point therapy" or "pressure point therapy"... (also called "acupressure") It WORKS. There is a book called "Pain Erasure" by Bonnie Prudden, which is an excellent primer. Basically, you look for (by pressing on the body in the problem area, one inch at a time) "tender points". These can be REALLY tender... I've got fibromylagia, and they can be so bad that I have a hard time not screaming when hubby works on them. When you find one (you'll know it!), press as firmly as you can stand, and hold it for 10 seconds. Release, and stretch the muscle group involved. Then look for another one. (don't go BACK to the same ones during the session... it's uncomfortable and doesn't help anyway)
These are tiny microspasms in the muscles. If they go into spasm and stay, they can eventually actually calcify, and cause a permanent "knot". The trigger point therapy breaks the spasm loose, and then the stretching you do (we don't stretch after every point... usually I just do a major stretch session after we've done them all) keeps it from going back into spasm.
Some can be released permanently. Many- those which are in the area of a major injury- often need periodic work for life. But it can really help and provide amazing relief...
Summerthyme