I think that I agree with your overall point but this

> If a company start optimizing on diversity metrics instead of on ability, then they’ll be crushed by market forces from companies who optimize on ability.

isn't necessarily true. A company's success is only very loosely related to the ability of its employees.