I'm rewatching episodes 17+18 tonight for the first time since the original airing.
I may come back a broken man. Again.
Wish me luck.
I'm planning to do another full re-watch just as soon as all my furniture and stuff catches up with me in Florida!