I forgot to comment on this earlier - I still need to watch (and hear) more stories from this era to be able to give a proper attention to your recs, but it was delightful to read this post even so.

Also, The Happiness Patrol is one of the best Doctor Who stories. This is a fact.