Workaround etcd Watch timeout bug

Oof, not only are you right, but I continued working off of this branch and this method only grew *larger*. Going to leave it for this PR, but yeah... definitely needs some refactoring.