How about leaving the wall which is by the stairs as it is, but pushing back just the section where the door is out onto the landing, as far back as the master bedroom door, to give you an L-shaped batheroom (you could move that bedroom door too, but not sure if the benefits would be worth it...