Shoulder PreHab

Last year around this time I messed up my left shoulder. Long story short I gained ALOT of fat and thus quite lifting.

Well I am determined to have a first successful bulk for 08. Problem is now my right shoulder feels funny.

There was no injury but it feels like it is going to pop constantly. I have been doing the shoulder prehab that Staley suggests for EDT. Behind the neck band pull downs, Serratus Pushups and light shoulder work.

Basically my right shoulder feels like how my left shoulder felt after the injury.

I have read every shoulder article on here but I am looking for other peoples opinions. What works for you? Did the pain eventually go away? or did the light pain or popping result in a bad injury?