Did they give you a name for your diagnosis? It sounds to me like Shoulder Impingement.
I had some surgery for Shoulder Impingement this past spring. It was called Arthroscopic Subacromial Decompression. They shaved down some bone on the underside of my shoulder bone to make more room between bones to lessen the pinching.
You might want to try doing an internet search with those terms to see if you can get some more information.
