We are making a trip on the weekend to the house, we finally sat down, and hashed out where things will go. We have decided to agree with the contractor, and will make a Master bath, and a master closet. Well the closet was there, but we will make an entry from the master bedroom, and remove the other door.
The Master bath was there, but it was the only bath upstairs, so in the remaining hall space, in front of the bath, we will change it to another bathroom.
Here is a photo, of the drawn out plans we made, I hope it's visible. The lines marked in red, are the changes. There aren't many...but they will make a dramatic change.