> I like how the author defines dystopia as [ ... ] rather than [... ]

There's no need to choose. Dystopia is more than one thing, and both of the sets of things you mention are just different kinds of dystopia.