As the conversation around diversity, equity and inclusion evolves, firms find themselves in a complex dance where the music occasionally skips a beat.