A to scale floor plan is a must from what I see a good sized bathroom I do not love toilet rooms in bathrooms and I would need to know a lot more about what you are planning for the bedroom since they are connected . My first thing would be to remove the carpet in the bedroom. So hence the reason for more info.

It looks like closets at the entry to the bath?...in that case you have much more room to work with?..a new layout for the whole area would have some advantages....walking through the closet to use the bath?....it would seem like a good idea to add a laundry upstairs ..but it would just add another traffic jam to the bath if it is located there ..

Put simply the bath should be separate and accessible..with a privacy element when in use..