In case you missed it! Learn about the KISS Threshold

Are you sure that's actually what's happening? Because I'm having the problem you've described you want to have. In my case, it's a motion activated rule and it has a few waits in it like you do, but if motion is detected again, the rule starts back from the beginning.

Here's the rule I am using. Once he makes it to the bathroom and then goes back to his room, the rule starts from the beginning and cancels the current rule running. There's a few suggestions in my thread to prevent it that I haven't tried yet.