Yeah, it wasn't a great ending - I think Moffat is really running down the clock on how long until he wholly runs out of ideas, the really good stuff this series (TH, Mummy, Flatline) has been in the form of standalone episodes that weren't by him.
And the Christmas special does look like it will be cripplingly cringeworthy.