I have this image of him entering a hall with the walls adored with every blaster/phaser ray gun prop from all sci-fi, and seeing his eyes bug out.
Christopher, the canonicity of any Doctor Who story is "ambiguous at best." Doctor Who doesn't have a defined canon in the same way that other media franchises do. You're applying a Star Trek definition of canon where it doesn't fit. The only Doctor Who stories that have been explicitly stated to be canonical are those post-Series 5 adventure games. Not even the television series has been stated to be such. And it's widely assumed now that "The Scream of the Shalka" is non-canon, but no one in any authority position has said so.
He was my enemy That was a great delivery. I liked the Rhutan reference. I wouldn't mind seeing them again (even if every Tom Baker villain seemed able to transform into someone else so they'll seem too close to the Zygons at the moment). Well, he apparently filmed that inside the TARDIS, so I'd take that as implicit.