Nice work.
To build off my last post I will suggest to work towards laying down a stable yet flexible foundation for your game. In other words, work towards getting the base functionality and core mechanics of your game down first before you get to the more complicating and exciting features.
Not urging you to abandon your current workflow of course I am just suggesting a general plan of getting all the basic features and functionality done that you can build off later as you get a more solid idea of how you want the game to be.