I think the story comes first. A diversity first approach just leads to a terrible story. Something like the Shawshank Redemption, thats a good story but it has no women. And when you have diversity first, you (generally speaking) don’t get good stories. Its not impossible, to be sure, but it usually turns into gimmicks and token characters.