Good work IronWill. As for your shoulder, I experienced some shoulders issues in the last year or so I was advised by a member here at MaB to make sure and strengthen the lateral and posterior delts. I didn't realize it, but my posterior delts in particular were extremely weak.
Also, when my shoulder was really giving my problems I focused on doing rotator cuff strengthening exercises. It seemed to work wonders.
As far as preworkouts, have you tried muscle pharm assault. I'm kind of picky about what preworkouts i'll use, but MP assault worked well for me. Good, clean, sustained energy and endurance.
"The fastest way to get strong muscles is also the fastest way to make them bigger. We know what works best to make them strong in the shortest time possible. If you want to get big, do the thing that makes them strong." - Marc Rippetoe
Zdravko Veselin Gaeta
I am not a powerlifter nor am I a bodybuilder. I just want to be big and strong.