"Do we lump all “diversity” into category two and just ensure that is crossed off the list. "

I am afraid that it comes down to that. Diversity is a good thing, but it's hard to qualify and quantify.