Welcome to the board

I can feel your pain on the shoulder impingement, I spent 6 weeks rehabing mine a few months ago. The trick is to continue doing the rehab exercises and warming up the area extensively before any major lifts. Listen to your body and you should make a great comeback.