For the bath, couldn't you add a sensor that detects water level in the bath and use it to override the lights? Even something as simple as measuring the weight of the tub would work, and would simultaneously cover the shower cases too.