I did sorta rush this game towards the end, not really having a lot of time for play testing.
I may not return to this game specifically, as even I wasn't too pleased with how it turned out, but I may use its base for a future game, incorporating the things you suggested.