Those are both really great ideas! If I do return to this, I would definitely redo/remove many of the redundant levels, giving more room for more mechanics like these.
