You can only do those two classic villains together once, and you know what I think Davies did it really well. The episode is also just such a good pick-me-up after the poorly paced mid as hell episode "Fear Her" that came just before. It's been so long since I watched it, and yeah, it gave me goosebumps again even though I knew exactly what to expect.
The best part about rewatching after so long is I only remember snippets and chunks so I know generally what happens but I truly do not remember how the Doctor gets outta this pickle so it's sorta like watching it for the first time again? Kinda?