Do you believe God made light on Day 1, or made it a second time, or what?
Do you believe the land was made after the water?
Do you believe that the Sun Moon and Stars were made on day 4?
jr,
My understanding agrees with your timeline. I see verses 1 & 2 as a summary statement of what is to follow. Everything God does to customize the earth, starting in verse 3 is as you wrote.