Ok, we had the changes done today.
And here's what the pipes that he removed, looked like in the yard, laid out:
Now I still don't know how the 3 bathrooms and kitchen sink came together into all this. They said my drawing above is incorrect, but I don't know what the correct drawing would look like and they don't seem likely to explain it. But they say that the changes today should cure it.