I'd imagine even RTD eventually planned for Gallifrey to be restored.
I sincerely doubt it. RTD hated the Time Lords and that's why he made them extinct. Including Gallifrey in The End of Time started as a suggestion from Julie Gardner which RTD was originally viciously against but eventually relented when he began trying to determine just that the Master's goal should be this time around and restoring Gallifrey popped into his head.
Even then, it took more arm-twisting to get the Time Lords into the story.