I would maybe say that your “average entropy” (what I’d call entropy) is always the average over every state, every single time, and (uniform) macrostates are just a handy conceptual shorthand for saying “I want all of these states to have equal p (equal -log p) and all of these to have zero p (infinite -log p)” without getting bogged down in why 0 log 0 is 0. A state is “in” a macrostate if it’s one of the states with nonzero p for that macrostate, but the sum is always over everything.
I would maybe say that your “average entropy” (what I’d call entropy) is always the average over every state, every single time, and (uniform) macrostates are just a handy conceptual shorthand for saying “I want all of these states to have equal p (equal -log p) and all of these to have zero p (infinite -log p)” without getting bogged down in why 0 log 0 is 0. A state is “in” a macrostate if it’s one of the states with nonzero p for that macrostate, but the sum is always over everything.