It's not what you want to hear, but:
Decrease chest and front delt work by 50% and 100%, respectively
Stretch and foam roll the pec major and minor
Increase rowing work, mid-trap work (i.e.: face pulls, prone scapula shrugs, etc.), and rear delt work by 50-100%
Reduce upper trap work and...