Unless someone has another solution, I'm thinking that it's time for a trip to the waterfront (a grave for the camera) and then a trip to the Sony store; can't see buying another one of these.
Well this is indeed not a problem with mirrorless as the focus is determined at the sensor. And while Sony probably has the best on sensor phase detect system out there right now, the new full frame mirrorless glass is stupid expensive (not just Sony, but Nikon, Canon, and Panasonic too).
I chose to go Panasonic M43 as the glass is great and reasonably priced. Plus Panasonic has the fastest, most accurate contrast detect AF on the market. Probably the best there is for static scenes, but not so much for tracking moving subjects.
It really is about the kind of photography you do as to which models will address it better.