I have the same long shower thing with my grandson when he is here at my house. thank goodness it isn't that often. how about putting a timer on the shower? I am sure a plumber would know how to do that. just a thought.