While you're doing all the rest of that make an appointment to see an orthopedic surgeon who specializes in sports injuries.
Chances are he's seen a lot of what you've got and he will know immediately what you need.
IME, you go to a surgeon, you're gonna need surgery. You go to an MD, you're gonna need pills. You go to a bone cruncher, you're gonna need popped. Etc. In the old dayz, the home folks just kept some Old Crow in the cabinet for all this stuff.
