The numbness has me a bit concerned - I have that but mine is related to nerve impingement and structural shoulder/neck/cervical spine issues. I cannot remember what you did last year for this - have you had a recent x-ray or MRI?
Does your shoulder hurt when doing pushups, chest presses, or over-head lifting?