Re:Over head activities are NO - NO!
If you have shoulder issues then don't even think about doing upright rows! They will wreak havoc with your joints at the best of times, but if you have a pre-existing condition then they could be catastrophic.
I'm currently recovering from an elbow/shoulder injury that means I haven't been able to do overhead pressing in months, and it hasn't affected my shoulder development whatsoever. My front delts already get hit hard from all pushing/pressing movements (benching and its variations, dips, etc), and my rear delts already get hammered from pretty much every back exercise I do. The only thing that is left somewhat neglected are my lateral delts, but this is easily resolved by throwing in a few sets of lateral raises for good measure.
Obviously merely allowing your front delts to get hit with your chest and your rear delts to get hit with your back would make the idea of doing a 'shoulder day' pretty obsolete, but this is a moot point for me because I think dedicating a whole day to shoulders is, for most trainers up to a certain level, an obsolete practice anyway for exactly the above reasons.