Hey Cootadude, thanks for the detailed reply.
Seems like we're mostly on the same wavelength as far as the approach needed to get the game in line with your vision. The good news is, you have sort of a design roadmap available based on what worked in this version and what didn't, should you choose to restart from scratch.