My doc told me to take the NSAID's and ice for about an hour twice a day if possible for two weeks and when the imflamation went away to use heat for a couple of weeks to help relax the tension on the tendons. This was for an elbow tendintis but it will work for shoulders too since I have tendonitis in both shoulders I have used this method on them. Time will help and strengthening the muscle group around the affected area and it sounds like you are on the right track. Good luck/