We are trying to finalise our master bed/bathroom and have two different designs (if you can think of any other way to change it please let us know!)

In the first place we have an almost 3m double shower and bathtub. A vanity, and toilet. I worry that having a 3m double shower is way to big.... And cold! Less intimate.

In option B we have jiggled everything around made our walkin closet longer and added the vanity on the nook of the WIC. We would then have space (2m) for the wet room double shower and tub. The main flaw we see with this plan is that we are moving the toilet over from near the WIC to closer to the master bedroom. That, and the fear (without being there in person) that it may be too claustrophobic?

Can anyone poke any holes in the design - anything you would change or ones you like better? Which would you choose and why?

Thanks!