Yea sounds like rotator --- my right shoulder is nice & jacked right now. That's a squirrely area because there are so many little tendons & stuff in there & upriight rows put you at weird angles. My left wrist always gets a pinch in that grip as well.
For rotators -- I would do the ice thing on it today if its inflamed -- 20 min ice on your shouder (or bag of frozen peas works great!), 20 off, 20 on , 20 off. Maybe use some ibuprofin before you train. Give it a few days before you do upper body stuff.
Then you can do a couple warm up exercises for it -- these really help me - but I have no idea if you ever really "recover" from a rotator thign - if you have a tear or something.
Trying to find illustrations of the warm ups I got from my chiro --- well I'll try to describe:
1) cable "inside" / "outside"
Set the cable to waist level w/ the single grip. Hold it in your right hand, elbow locked into your side at waist level. Stand facing perpendicular to the cable frame but out from it a bit. Pull so your range is from your left side (w/ your right hand) to the right. This is like the front to side range of your rotator. Then the same on the other side. Then when you finish the other side, stay standing there, put the grip in your right hand again and face further away from the cable frame - and the pull range is from mid to behind you - again keeping the elbow tight to your waist and goign slow so you don't jack your shoulder w/ a hard pull. Then repeat on the other side. The weight is really light - its not a strength move - just some resistance to get a good stretch in yoru shouder --- I do like 5-10 lb on the cable, 3 sets of it all 15 reps each of the 4 positions.
2) lateral raises but to 45 degrees from front -- again not heavy - just like light front raises but a bit to the side. -- 3 sets x 15
3) what i call lying shoulder presses - lay down on a flat bench but w/ your right shoulder over the edge. Hold a DB (again light) straigh up over your face and just press up w/ the shoulder -- 15 reps per side, switch -- so the range of motion is only your shouder going up & down.
Up until last week (when I over lifted on some shrugs) that series of warms up at like 5-15 lbs of weight has kept everything workign really well.
My right rotator has been sore since at least 1992 - I remember having it get sore whenever I did that goofy rotater / shoulder machine (sort of like a pec deck motion) but more of a Nautilus style machine. Its never been debilitating but I'm sure its never "healed" either. But the warmups help a bunch before any upper body stuff.