I can agree with the trap work, something I'm at fault for not doing!
My shoulder workout normally alternates between:
w/o 1 - Military press
w/o 2 - superset incline d/b lateral raises and bent over laterla raises.
Shoulders not doing bad at all, yep will include the trap work to complete the "cage".
I don't quite like too big traps (eg: Lou Ferrigno or Brok Lesner), not the best look around.