I rewatched City of Death again recently
and pretty all your complaints with the possible exception of 'touchy-feely"* apply to it. What would you expect when you have the genius of Tom Baker combined with the genius of Douglas Adams (and Lalla Ward in a schoolgirl outfit. It seems your main problem is that DNA is dead.
*From the 'chemistry' between the leads I expect there was plenty of 'touchy-feely' going on behind the scenes.