Have you tried cable upright rows. I've done them periodically when the tendonitis-that-Spatts-thinks-I-have-but-I-don't is flaring up. There is zero pain from cable uprights.
I also hit shrugs... and there is another great trap exercise that used to be popular but now no one uses... get in the standing calf raise and shrug the collar.