I would challenge your view of the word "chaos" as something not required by the text. In fact, IS 45 is to me instructive to suggest that a better word is inchoate or unfulfilled. IS 45 is clearly about purpose -- what the earth was intended for - namely, us. Obviously the earth was not habitable on day one.
That being said, what is it that requires "chaos" as the state of the earth on day one?
Jer. 4:23 to 4:27 is helpful to your cause. It equates destroyed cities with tohu bohu.
But again, these words have enormous range of meaning.
A popular translation, tohu is equated with vanity and confusion. As for "vanity", the concept of immature or unfulfilled lends some assistance. So, to whose perspective is Gen. 1:2 tailored? To God's or to ours? To us, for whom it was all made, it would indeed be chaotic and unprofitable for habitation. Living there would be living in vain. To God who sees the end from the beginning, it was not that simple. So, I would not worry about God having made something "bad" or less than worthy on day one. One might ask why he bothered to take six days if that were the point. One argument is that he took six days for our benefit. It was indeed about us and how we measure and live. He created a model for us of six days and then rest.
Here is a word study.
http://cf.blueletterbible.org/lang/lexicon/lexicon.cfm?Strongs=H08414&Version=kjv