I had shoulder pain thanks to a good bicycle crash on the way to work years ago, I have learnt to put up with it until a few months ago when I replaced my old tourer with a new one and went up two sizes...................no more shoulder pain, pity I didn't do this earlier.
I also found getting off and stretching every 20klm for about 5 minutes helps a great deal also.
Hope this helps
Sam