My neck and shoulder pain went away after I started kayaking. I am not saying it is for everyone, and I cannot say for sure even that it worked for me, but I suspect it did.
I started doing push-ups every day. I hate push-ups and I am not very good at them, to make it easier I do them on an incline and it has helped tremendously with my shoulder and neck pain.