Really I just want my happy space family back, is that too much to ask?

No, no it's not. I vote we petition Moffat to do this for us.

'Dear Santa Moff, please to be writing all the scenes between Team TARDIS to be fun and silly and happy families and confusion and newly-discovered family awkwardnesses. Plot secondary to character studies in all these situations, please and thank you' - that should do it?