Right any the firmament separates the after waters above from the waters below, and the sun, the moon and the stars are there. It implies the waters are not in the firmament.
And in your scenario did these waters already exist at the beginning of the story? If not there seems to be no mention of it a appearance.
The formless and void earth of verse 2, when did that appear?