Our bathroom planning, need input

We had deliberately left out the bathroom planning for the time being, there were enough other things to arrange. But since the execution planning is currently underway and we are already looking into the electrical installation, we took a closer look at our bathroom and are not really happy. Sure, the bathroom is quite small, there are not many options, but there is definitely room for optimization.

In general, it bothers us that there is little space around the bathtub (decorations, utensils, our daughter's toys) and that the toilet somehow is the central point in the bathroom. We also do not necessarily want the sink and toilet directly next to each other. My wife would like to have shelves for towels in the drywall partition, so space is needed.

Attached is the current plan and our thoughts from today.

PS: The windows in the bathroom are small 80 x 80 windows, the window sill should be at about 150 cm.

Please dimension the whole thing.

What should I measure extensively? The bathroom is approximately 2 x 4 meters.

And this is roughly what it is about...

I would swap the bathtub and the shower.

And that's approximately what it's about...

Dimensions according to plan 2 x 4.24 meters

Without plaster, tiles and possibly drywall.

I would swap the bathtub and shower.

In our changed plan?
We originally considered that too, but it would make the paths more difficult with a commode chair,
As it is currently planned, you could drive straight to the shower from the door.