Just to note. My chiropractor said that it seems to be an impingement of supraspinatus and bicep tendons (although hard to accurately tell). He said there is some stiffness, but I have decent range of movement. He said it was a bit worrying about the bicep inflammation and said it could have been a partial tear.

When he pressed on the supraspinatus muslce and bicep tendons, they felt quite tender. Not unbearable, but noticable.
Is worth noting that the inital injury came from overhead pressing followed by pull-ups. No pain, just stiffness afterwards and inflammation - espcially the bicep near the shoulder.

The discomfort at the moment is just a bit stiff and feels a little tight at the front of the shoulder. I sometimes get a sort of 'niggly' pain on the bicep tendon too. All of this on right side, but sometimes I get a little in my left side (rare). I cant sleep on my right side, otherwise it makes it worse. Sometimes my shoulder / arm stiffnes up and feels quite tight, even though im not going to the gym.

Chiropractor mentioned that an Wikipedia reference-linkMRI is an option, if I want to do down that route. Which at the moment, I'd rather just find out whats wrong (MRI doesnt bother me, had one before), and find a decent physio who can help with things.

Had a bad day, so this pretty much put the icing on the cake. Some advice would really be appricated.