I think this is a great move in the right direction. Do take care of your frozen shoulder if that is what it is. The outcome most times is not good. I used to know an orthopaedic surgeon who had frozen shoulder and was so scared of doing a surgery for the fear of people thinking his hands may not be good for surgery again. So he is steadily on intracapsular steroids ... You could also reduce the weight or intensity of the work out a little. Just a suggestion..