Well heres what i did and still do before working out.
I started out with a 5 pound plate and put my thumb thru the whole and standing with it down to the side of my thigh i run it in a circular motion for 10 clock and counter clockwise, then lift it so its horizontal with my shoulder and do 10 each, then raise it over my head and the same 10 clock and counter clockwise, this is the warm up i do before sitting down to do anything now, i will often take the weight and swing it in front of me like a pendalum this idea was given to me by and old ass timer who had shoulder problems also and it works. I do these very strict and feel the shoulder carrying the weight, holding it all my concentration is on that shoulder.
Ya know something we do look silly to one man but who the fuck cares when it might save us from having an injury that would ruin our lifting careers and maybe alot of other activities we do, try holding yourself up over the wife with one arm LOL not easy especially when your like 280 pounds like myself i'd flatten her so i need both shoulders workin man....
Keep up on the ice it will relieve the pain when nothing else will work i got up many a nights just to ice down my shoulder, also this is when my lifitng pattern changed i never workout more then 2 days in a row and often workout every other day for 3 ( 1 on 1 off, 1 on 1 off 1 o 1 off) and then 2 off, you have got to recover or you're going to have injury's...........period.
OK here are some other things i did especially just after the injury once i was able to come back to the gym,
http://images.google.com/imgres?img...images?q=shoulder+therapy+exercises&hl=en&lr=