Wow.. Good luck with all that. Don't want to make you worry ahead of time, but I wouldn't hold my breath if dealing with focusing issue. I just got my camera from it's second trip to the shop. They returned it saying that it's within specs which is far from it. Hopefully your camera and lens can be fixed/adjusted properly.
At least you have your second body! I'm about to go to Asia which I planned for a while and now my camera is good with LV focusing mostly, which sucks - I'm going to my friend's wedding.