Rotator cuff injury?

I slightly tore my rotator cuff in an auto accident about 2 years ago. It wasnt bad enough for surgery, and for the most part the pain is gone, but when i do regular simple activities (rake, sweep, etc) the pain will come back. I have also noticed sometimes in the morning when i wake up it is stiff and sore. I dont know what to do!! I cant avoid the activities i am doing and aspirin/pain reliever doesnt help at all. I also have a hottub i soak it in but that doesnt help either. I feel stuck with this annoying injury, but i dont want or need surgery. It isnt sore all the time either..Any suggestions?