And if all else fails, you could always get a second water heater upstairs, a tankless water heater, which would be a really small unit, and it would supply additional water to that second floor bathroom.