Having seen Teotihuacan and Chichen Itza, the big benefit to Teotihuacan (unless it's changed) is that you can still go up to the top of the pyramid. If you have to go to Mexico City anyway, I would just do that.