If you're going to do the Sherlock Holmes thing (ie The Final Problem and The Empty Room) then this would be the way to do it. But I can't see them going back to do that.

Nonetheless, I'm going with your version of events. :)