Well - to me you could have one of several issues. Very often when rest and lying on the shoulder creates pain, there is some amount of structural damage - to the supraspin tendon, and the area where it passes under the acromion. Secondary impingement is very common and can lead to your situation. Once your do a lot of overhead lifting the damaged tendon will get impinged. An inflamed or slightly damaged tendon is thicker than normally and therefore more prone to impingement - it is very important that you give the tendon the time to heal - and to continue the rehab for your scapula control - you will have to continously do that rehab - it should become like brushing your teeth - every day a little bit !!! Hope this advice helps you !!!