How is your sodium/electrolyte intake? It may be that you might need to add a little electrolytes to your water - I have found this really helps me.

When your shoulder tenses, do you feel that tension anywhere else? Any chance you are rounding your shoulders without realizing it? This can cause tension. Are you on a bike with road bars or a bike with flat or riser bars?