I've actually only ever watch EoT once (aside from pieces here and there) so I don't quite have the background to work out a fanwank theory to reconcile the two. If you have a theory that works for you then go for it, at some point I may sit down and try and make my own. But also for me, complaining about that has a lot to do with how little this story affected me; if I liked DotD I would have rushed to try and find a way to make it fit with my view of DW, but I mostly didn't care for it. Especially the end which is the part with the most contradictions, it should have made me feel things, but it rung so hollow where EoT did not; I don't rewatch that one in part because of just how much it makes me feel.

And really, just a few days later what feels there were aren't there any more and I'll go back to bitching about TVD instead.