take some time off anf let the shoulder rest, then if you can do shoulders with chest because they get hit alot on chest day. do dumbbell or barbell shoulder press, lateral raises, rear lat raises, and if you want upright rows, but use strict form. i have a bad shoulder as well the doc says i may possible need surgery so im trying to avoid that at all cost