Try a hot shower maybe and try to roll your shoulders while you are under the water
Better look after the shoulder. I had 3 steel pins keeping mine in place. Rest is best with heat.
If it doesn't get better see a doc. N also lookup some shoulder n neck exercises.
I suffer from a frozen one in winters n its real rough.