I've been trying to think of a way that EoT and TDotD could co-exist for a moment.

In EoT:

• The capitol is already destroyed, as you can see here: http://static2.wikia.nocookie.net/__cb20100102104757/tardis/images/a/a0/Gallifrey_time_war.jpg
• We can't see any Daleks above the Capitol
• The assistant of Rassilon says that they know the doctor "still possesses the Moment"
• The whole planet appears in Earth's sky, without any Daleks

In TDotD:

• The War Council discovers that the Doctor stole the Moment during the attack
• The War Council suggests that the plans of the High Council have "already failed"
• The Doctor ends the Time War while Gallifrey is under attack.

What I am suggesting here is that the two attacks we see in TNotD are actually not necessarily related, and that the Daleks maybe had to retreat for a moment. That would make the events occur like this:

• Fall of Arcadia (scene with War Doctor and the laser gun)
• Scene of the War Council discovering that the Doctor stole the moment
• Partial destruction of the Capitol
• Retreat of the Daleks
• Events of EoT
• Daleks coming back, for their "biggest ever attack"
• Events of the end of TDotD

I think this is the best explanation to make the link between the two episodes.

Also, I would like to note that this plot is quite complex. You can't stay for years with such a detailed complex plot, because following that plot would require to come back on the events of the plot, possibly using flashbacks, making the actors involved in the plot come back, etc.

With RTD, we had to wait 5 years before having a proper explanation about what happened in the Time War, but that was fine, because as long as you give little details, and you just throw vague descriptions on what it was supposed to be, any writer can come back with its own story and write about it.

TNotD was pretty much detailed and involved a very complex plot: Gallifrey is frozen in a parallel pocket universe, and all the Doctors together ended the Time War like that. This is not something you can just retcon with a single sentence.

A lot of people think that the new quest of the Doctor will last another 50 years, but I don't think so. You can't just elaborate such a complex plot and then throw it away. I think the quest will be more active than some of us may think. This plot must be addressed soon, or else it will lose all his power and interest. That's why I think the Gallifrey issue may be addressed sooner than we think. Maybe Gallifrey won't actually come back in the next few years (I bet on 10-15 years), but the quest for Gallifrey must go on, and can't be put aside for a long time.