The surveillance state is absolutely associated with diversity. Because increases in diversity is overwhelmingly associated with increases in crime, it justifies greater surveillance by the state, not less. In fact all state interventions (read police) are increased when you have more ethnic groups in one place, because they are more likely to be in conflict, and less likely to have a common set of values (or incentive) to resolve their conflicts.