Scotty -
I just went through rotator surgery so I have first hand experience. My doctor is one of the preeminent orthopedic sports doctors in the country (he is team Dr for Giants, Sharks and Raiders).
This is the regimine I was told to follow ...
Take Ibuprofen 800mg , 3x per day to decrease inflamtion. Take them until the pain went away or until I started puking blood (his words).
Ice regularly (try 2-3 times per day).
Avoid heavy lifting and find yourself a good PT who can show you the proper exercises to build up the surrounding muscles (helps take the strain off the injured one).
Do not apply heat. Blood flow and better circulation will be accomplished with PT (physical therapy).
A cortisone shot may help (if it is truly caused from inflamtion). An MRI will easily identify the extent of the damage.
The standard answer given by all orthopods to these types of injuries is RICE
Rest
Ice
Compression
Elevation
If the injury requires surgery then the inflammation medicine and icing will be of little help. It is critical to find out the extent of the injury to know what and where the problem is. Your shoulder/rotator area is made up of many anterior, posterior and lateral muscles so you need to identify which one(s) are affected.
Either way if surgery is needed or not a good PT and frequent, high rep, low weight exercises will help to strengthen the supporting muscles.
Good luck
PS - It took almost a year to recover from the surgery so my recommendation is to take it easy and let it recover otherwise you are setting yourself up for bigger problems in the future