I have had shoulder issues off & on for a couple yrs now & I can say for me the best medicine was rest!! I know we hate to do it but it was better in the long run!
Right before Christmas I did it once again & I finally got it through my head to do a complete rest of upper body. I did a "NUB" roataion (No Upper Body) for about 4 weeks then very & I mean very slowly added upper body back in using light weights & building up. My PA gave me some PT to do which I added in about 3 weeks into the rest & I feel that really helped as well. Like you said the ice was invovled during this time. IT was hard but very worth it in the end!
Good luck with it!