I would definitely focus on external rotation work and horizontal pulling as supplementary exercises. Massage/tennis ball it a lot to break up anything. It's probably instability more than anything... if external rotators/posterior shoulder get tired fast + poor posture = instability and pain. Strengthen it up.. try to avoid pressing for a bit.
Sounds good with the program with strength bias.