Late to my own party, but...
So it's clear from all of these clues that the story is based on the script for T:JO and not the episode that aired.
Ah... you got me
A combination of a manufacturing fault that makes part of my copy of S2 unplayable and my iTunes playing up meant I wrote this one from my recollection of the episode. I checked a couple of points against the script, which as you've pointed out, apparently don't match up with the episode that aired.
How embarrassing.