Bummer man, glad you're basically alright at this point.
FWIW, When I broke my collar bone, it took 2 years for all the pain to go away. My shoulder still aches if I go for a hike or a run, and its been 4 years. Its the same as yours, one part sticks up.