Deadlifts and rack pulls are my favorites.

Try doing light weight shrugs for as many reps as you can bang out. I've just recently started doing this and I am noticing a difference. I use 45 lb dbs for like 35, 30, 25, or more if I feel the need that day. Sometimes I'll use a smith machine with 135 and just go nuts. I'm a bigger proponent of form than heavy weights anyway. I always get the best workouts from using weight I can complete a full range of motion with than when I try to stack the super weights on. See what you think.

shrug it. I like going heavy with 8 reps. I mostly use barbell i find it is more comfortable for me.
Upright rows are good but then generaly hit the deltoid complex, when i do light reps i get a good pump in my delts and traps.

Alot of power lifting excercises are good for the traps. Clean and jerk, deadlifts.
But the most direct excercise is BARBELL OR DUMBELL SHRUGS!!!!!

I go heavy dumbells maybe warmup with 90's and work my way up to 130. just keep thinking, "I dunno" "Idunno" do not roll your shoulders...this is so bad for them. If you want to work the fronts..then move the weight to the front and start your "I dunno's" there.

i'd say heavy deads and shrugs. you're doing side raises and upright rows for your traps? in my opinion those do very little to nothing for traps (for me, at least), so i'd ditch those on trap day and do them on shoulder day instead.
my 2 cents