add face pulls into your routine, and get a decent shoulder warm up for before your upper body days. I like the dieselcrew 5 minute shoulder warm up. If you google it you'll find it. Makes your shoulders feel good as new after
Face pulls are already in there, my current shoulder workout looks likes this:
Seated military press/overhead press (either or)
rear delt flyes
After following Stephen Johnson's post, I've decided to remove upright row, as its the only exercise to cause pain, and include Barbell Rear Delt Raise to get more posterior work (as I've only recently in the last 2 weeks added face pulls and rear delt flys.)
I wrote something long and awesome, but it got eaten by the hotel wifi. So here's the cole's notes:
Why do you need to do delt work? Do you have a delt problem? Cuz it sounds like you don't, but if you keep it up, you will. Your delts probably get plenty of work on your bench/chest day. Focus on your rear delts, and all of a sudden those front and side delts will be a whole lot better...
Delt work is primarily for appearance, and with the workout above I believe I have hit the rear delts pretttttty good? As for chest day, I've reduced heavily the amount of chest work as when I first started working out I was only focusing on the 'beach' muscles and now my chest is looking how I want it after easing the workout.