This is pretty much my routine, except I have an extra step: While I am working on that thing, if I find a really important thing that needs to be taken care of, I write it down as the next task.

That way if anyone interrupts me or if I find a important refactoring or think of something important I get to remember it (and do it) without being distracted at that moment.