Re-reading your diagram, and I am not an expert on the issue, but my understanding of Thom's and others writing on this matter is that the fix corrects the problem shown on your "Bent/Warped AF sensor" line.
I am not sure what causes your camera's specific issues started with and why the fix did not take for your unit, in which case perhaps back again for repair or this time around replacement? In the fullness of all avenues approach, it would be ideal to try it with a friends AF-S lens (as opposed to your D lenses), but that may be a futile effort, very hard to say without taking the time to do it. I don't believe I've read any comment on D lenses this entire time, it's just a pattern I noticed in your specific situation. Please keep us posted.
Would still like to hear the other gentleman's (in this thread) experience when he gets his back.