Can I track based on diversity goals and not overall goal?

Yes, go to Tier 2 Reporting, click the gear icon and choose Tier 2 Goal Settings.

Disable Overall Goals in this section.