Try doing a couple of more explosive exercises, too. I like to do, it is similar to a hanging clean, but I believe it is called a snatch. I load up some fairly heavy weight on a bar bell, then lower it like a hanging clean. When I explode up I try to keep my elbows above the bar and explode through the lift without flipping and cleaning it. I target the lift to between my lower chest and eyes.
I also like to do heavy and moderate explosive lawn mower pulls with dumbells. It is like your db row for back, except you stand a little taller and explode. Keep the db in front of you, again with your elbows higher than the weights, pamls facing you, and lift it head high.
These are both explosive exercises with an almost plyo effect that have really accelerated my trap development. As far as barbell and dumbell shrugs go, you need more variety. You will get so much more power and muscle gain from variety. Rep hold and super heavy faster reps will work.....both together will work more. Never seclude yourself to just one exercise or just one style.
Variety is the spice of life bro! Maybe even add in some reverse pec deck and clip a rope to a dumbell and try your upright rows like that.