Something like your version:
was how my no. 4 looked, just mirrored. I see the problem that a partition wall of only 100 cm from the shower is not enough to catch all the splashing water, so it would have to be longer. But then the passage corner partition wall/wall corner becomes very narrow. For me, it was about 59 cm.