Mouth watering reno! Must have cost you a bomb!
I'm moving to an EM too come May will be starting my renovation in April and I'm having similar layout as yours. The current Owner has a walk in wardrobe with the toilet in the master bed room and still got space to have a baby cot and have more than enough space for another single mattress on the floor however the walk path between the queen bed and walk in wardrobe is kind of narrow around 50-60 cm. I will still keep the Walk in Wardrobe concept.