Since there's no deadline for this game anymore, I'm taking as much time as I need. My goal now is just "as soon as possible."
I tried to design it with only what would be needed in mind, but even then in retrospect it was definitely overscoped. Lesson learned.