I feel your pain. Adding things like upgrades or levels when we work on small-scale games are time killers, but there's always a desire to fit them nicely.
Looking forward to any updates. DM me on discord @salsero if your team ever wants to talk games.