I think the two scenes fit together pretty well. In the Tales of the TARDIS scene they get to go into a little more depth about what happened between them than they were able to in the heat of the moment during Power of the Doctor. TotT implies that there was a heated discussion / argument / disagreement following the events of DiT and Ace left.
As for supplemental material, I never put those into consideration when new canonical material is concerned. As much as I loved the old Star Wars EU and the Star Trek novel verse, I had no illusions nor desire to see the books adapted to screen.
As for the soap opera of it all, I can honestly say that my only exposure to that soap opera has been Dimensions in Time, so therefore I can just write those people off as any other people who were caught in a bizarre situation with the Doctor and no different than Mike and Gary from last night.
I forgot the timelines line. That was them covering it all anyway, so I should just extend it to the DiT business they mention. Or just assume it was a different day with the Rani. Something more befitting the pair, like something about animal experimentation.