The proposal takes into consideration your requirement to keep as much closet as possible but still arrange the space to accommodate a conformable bathroom with a separate toilet.
The new location of the WC shall be workable with minor diversion of the existing piping, you can go for in 2 options: floor standing bowl or wall hung model. A glass partition (that could be frosted if preferred) ensures the space is getting a good privacy. The vanity sink is doubled up (his and hers) and kept at the same position so it can be used as make up/dressing area, working together with the closet. The bathtub enjoys direct sun from the existing skylight above, giving a nice feeling while soaking in it and looking through the new window. The walk in shower is pared with the bathtub and enclosed with a glass partition to contain the water splashes to the wet area. The new window will bring more light and fresh air to the overall space, as the door diving the closet from the bath has been removed.