Indeed, choosing right people for right role is important.

Diversity could never be a goal, it creates exclusivity and privilege of one group over others. The diversity will happen in healthy environment naturally overtime. The real goal is to fight discrimination.