For shoulders, I think standing military presses are the name of the game for mass building. I also really enjoy one arm lateral raises. IMO, it's fine to cheat the weight up, the negative is the more important part of the movement. Try to really control it coming down.
I would suggest you train traps as part of back day, and make sure it is the first thing you do that day.