My traps seem to be able to take and recover from a tremedous amount of work. Don't know how true that is for others.

I do them both, like Kane. You could try supersetting shrughs and high pulls or upright rows, I suppose.

High pulls will work your shoulders a little more. They are like upright rows but with a wide grip.

You could also try upping the frequency of you trap work if they don't respond the way you'd like.

Be VERY wary of direct neck work. Keep the weight light. Lighter than you think you need. The neck muscles should respond to very little work, but I would recommend against it on a regular basis. You could very easily end up with permanent injury. Also, you may not even be aware that you've injured your neck when it happens.