I think that's a step in the right direction. I'd just take it one step further, consider all the factors of each person's life, and thus treat people as individuals and not as representatives of a few select groups. Intersectionality excludes too many factors as it focuses on just a few.