Our shower has two drainage problems: the water does drain from the bathtub shelf back into the bath; and, when the errant water drips onto the bathroom floor it runs past the floor drain and creates a huge puddle in the middle of the floor. Is there an easy fix, including cutting shallow grooves into the tiles as this should be enough. We do have spare replacement slate if needed.