My friend dislocated her shoulder, and a doctor fixed it. A week later she dislocated it again so she had surgery to keep it in place. I think that you should see another doctor who can fix your shoulder permanently.
I am really shocked that you were able to pop your shoulder back in place by yourself. My friend said the pain was worse than childbirth.