Which layout upstairs?

[TremoloGreen]

This is a plan of my first floor. Currently have the master bedroom at the front, small family bathroom opposite, massive airing cupboard (1.73 x 1.22) adjacent, with a tiny shower room (1.73 x 1.40) next to it and another two bedrooms (one double, one single) at the back. Plan is not to scale!

We are moving all the plumbing to the loft so can make use of the cupboard space. Wondering if others think it is more useful to a) extend the shower room to give more space - current layout allows for a 1400 x 800 sliding door shower, 600 vanity unit and a towel rail but not loads of space for manouver. There's no loo in there but we have two others in the house. Or b) absorb it in to our bedroom. Its a good size room with built in storage on the long wall but due to its awkward shape (it comprises the stair bulkhead), no wall long enough for a large bed and two side tables to stand along. If we absorbed the cupboard, this room could have a long wall where the current bedroom door is, a good 4m of cupboards, plus we could restore the fireplace and room for a desk/dressing table. I prefer b, DH thinks a.

So a, b or c (something more clever that we haven't thought of)?

[Cressandra]

Shame about that wall but it sounds like a good plan. Thanks for updating.