Movement patterns need to be corrected or the situation will continue to occur because the cause is still there.
Continuing movement with deviations in technique reinforce incorrect movement patterns.
Take a few steps back and work with some on correcting the positioning and movement patterns.

You may need to do less upper body focused work as you are correcting positioning and movement patterns. Correcting the cause of the situation is the only way it will resolve. There are several things this may include mobility, stability, technique work, drills etc.

Restoring shoulder full shoulder mobility is key as well.
Full shoulder mobility/range of motion without pain.