As Rodjas recomendations(I forgot about them unroll I made this thread) I will be looking into Active Release Therapy(ART) tomorrow.

Also to add: I injured my Right shoulder about 2 years ago, x-rays showed deteriorated cartilage. It hurts somewhat on bench and upright rows are rarely an option any more.