quiet_elegance went for his follow up to the osteopath today who says there's scar tissue and calcification that will need orthoscopic surgery. This is great news! It's a little procedure, not the big, scary replacement scenario he was afraid they'd require of him. He'll be out for 3 days, they say. They're thinking of doing it this month, even. Whew!
ETA: He's going in a week from tomorrow.