First, if you haven't yet, I'd ask Eric Cressey or Mike Robertson in their Locker Room. They seem to have a nice handle on the whole "Shoulder-health-thing".
Along those lines, I'd check out Cressey's Rotator Cuff routine:
Aside from that, my instinct is to have you train your upper back and vetical/horizontal pulling muscles with some higher reps, to counteract any endurance imbalances that may have been developing.
I don't want to be a buzzkill, but that may not be an option right now (obviously, just my opinion). It might be better, though maybe not practical, to concentrate on peaking only when necessary and simply maintaining the rest of the time. Better to strive to be at 80% and acheive it, than burn yourself out striving to be consistently at 100%. Know what I mean?