Hey,
yeah, that makes sense. How about having two watches, each querying the last watcher history entry and the regular query and thus allowing you to decide in the condition if you need a 'everything back ok' or a 'things are broken, send an email' type of things?
--Alex