In reply to Tigger:
Lacross ball (or hard spikey ball) rather than a tennis ball, lift hips when "rolling" traps, pecs, also less rolling, the objective is to release/allow the muscles to melt around. Once relaxed move the arm, think snow angel.
T's etc. 40-50 reps sounds high. 10-15 reps and maintain good form. Same with push-ups.
To mix it up consider the following... Banded pull aparts (underhand grip), Pallof press (medium band), Turkish get-ups (light db/KB).
With all the exercises, "set" your back and lats before you start, ideally use a mirror, use lats to pull shoulders back and down, notice if they tend to hitch up to your ears during the movement - happens easily when traps dominate and you are no longer exercising shoulder stabilisers.