Instead of the normal bathtub placed diagonally, use a corner bathtub, which is available starting from a leg length of 125cm (and of course straighten the slant towards the bedroom), then it won’t be tight, but will fit easily (even with a leg length up to 140cm; if I read this correctly from the original plan, there is 151cm available, so that still fits with plaster, tiles, etc.).
The walk-in shower can be left as is; if necessary, a glass door can still be installed later if it bothers you that the area in front of the toilet might get wet. Otherwise, you have 150cm there (minus plaster and tiles still a good 140cm).
The shower becomes brighter if you install a light strip at the top (for example, also with glass blocks, which don’t always have to be cleaned from splashes).
Reducing to a larger single sink makes sense. I have seen a quite stylish concrete sink that can be custom-made in any length. So you could choose the suitable size and potentially solve the problem with two faucets.
I don’t think swapping bathroom and bedroom is a good idea, especially if you have very different wake-up and bedtime schedules. Now one person gets up, leaves the bedroom door, and can get ready in the dressing room and bathroom. If the bedroom lies between the bathroom and dressing room, you always have to walk through the bedroom. That would be a no-go for me.
