Agree with your assessment of the first two stories - there's a part of me that hates the sheer trad-ness of UTL/BTF, but truth be told, I can acknowledge that it's competently made.
However, I would point out that I rather loved the resolution to "The Witch's Familiar" - it wasn't just "Extermination" - the Doctor…