What about core strength work? Lots of riders who lack sufficient core strength put too much weight on their arms, causing neck/shoulder pain. You shoud be able to support your upper body on thebike with your core, not your arms.

Are your elbows flexed when you ride, acting like little shock absorbers, or are they straight, transferring every bump and twitch directly to your neck and shoulders?