Sorry to be the bearer of bad news, but a shoulder takes a long time to recover. I've had all of mine done and they were each 6-8 months before I was diving again.
It's not the heavy work (tanks, ladders, cameras, etc) that gets you, it's trying to push your arm into a wetsuit, putting a mask over your head or shooing away a fly. It's very frustrating. Sorry.