I still maintain my opinion that diversity is used to calculate the TOTAL load for an installation, and not for designing individual circuits..
It's perfectly legitimate to apply diversity when calculating design current. Otherwise you could end up severely over-engineering.
Do you apply diversity to distribution circuits?