Whenever I think about the fact that The Toymaker and The Doctor canonically have met many times before, I think The Toymaker just becomes an inconvenience to the point this exact situation had to happen at least once in their lives. 
20th anniversaries of movie debuts coming up in 2024:
Shrek 2, The Incredibles. The Polar Express and The SpongeBob Squarepants Movie. (There are some others as well, 2004 was a nice year for film mostly.)