The hardcoded ability numbers blocking the currency/upgrade system is such a relatable trap - that stuff always feels fine until the feature that needs it to be flexible finally shows up. Good call splitting mechanics into smaller chunks too, "simple" features eating weeks in testing is exactly why scope creep sneaks up on you.