City redesign is the BEST part of the game. You get to clean up all the little mistakes and inefficiencies from your current chapter that you didn't have space to work around. You get to research and plan for all kinds of new buildings for the next chapter. You get to re-assess/delete all your culture and culture/pop buildings, and stick them into a corner.
Your reorg based on ElvenStats shouldn't be bad. Consider deleting all of your Dwarven Streets now (since you either have unlocked or nearly have unlocked Fairy Streets). Then start tucking all of your culture and culture/pop into the lower right corner.
If I were you, I'd be grouchy about entering into Orcs (hands-down the worst chapter), but not grouchy about clearing some space to power through Orcs.
As an aside, if I were you, I'd be jumping all over Portal Profit buildings, and using those instants to shave 2-3 weeks off my time in Orcs.