Definitely listen to the advice not to do anything that hurts. You gotta be careful with shoulder pain, it's a very unstable joint and any problems can easily become chronic if not dealt with.
I'd be careful with the upright rows, they can actually cause further problems in people with existing...