Ok, you told me about half of the workout. What is your rep/set scheme?
If you don't want size - just tone I recommend you lift heavy for lower reps/sets. You may be bulking by doing too many reps with a small weight.
Also, keep in mind that it may be your body type you a fighting. If your body is genetically predisposed to have broad strong shoulders, then that is what you will have. My wife is the same way. She was a swimmer, and when she lifts her shoulders go back to broad swimmers shoulders. There is nothing wrong with that as long as the rest of your body is somewhat proportionate.