Unusual shoulder injury

Hi all,
I am a 25 year old physio student and a very keen sportsman. I injured my right shoulder 5 weeks ago and had an x-ray and physio for a subluxation. On a second opinion I went for a MRI yesterday turns out I have a non displaced humeral head fracture a partial thickness tear to my superspinatus tendon. I have been doing gym exercises since a week post injury as well as scapula setting exercises. Gym exercises have not caused any pain these included heavy deadlifting and rowing exercises. What do other physio's think is my best course of action? I still have limited ROM and tend to hitch on abduction and shoulder flexion? Should I consider surgery? And what is the usual healing time?
All the best