TOS: Metamorphosis, streamed on Netflix.
Interestingly, the shuttle appears to be the original Galileo, despite the fact that it was of course destroyed back in the first season, and eventually replaced at some point with the Galileo II. This is a minor glitch, but almost seems like something that could have been corrected during the remastering project.
I loved Cochrane's little house, it reminded me of the Morbius house from Forbidden Planet.
The Companion was able to rejuvenate an old and dying Cochrane, and was able to stop Kirk, Spock and McCoy from aging, yet was unable or unwilling to cure Commissioner Hedford until it decided it needed a human body to inhabit. This was a sort of, I dunno, shitty thing to do, really.
The TNG crew got to meet the wild rock-and-roll drunk version of Zefram Cochrane in First Contact, but 150 years of being shipwrecked apparently drained all the fun out of him. When he first saw the nacelles on the shuttlecraft, did he recognize that they looked a lot like the warp nacelles on the Phoenix?
All in all, this was an OK episode, not bad but not great either.