I tend to put states at the page level (or at the level of a major container) for this reason. All of the needed states are in one place, and I know where to look if I have to come back to it after a while.