Make cultural identity the setting instead of race. It's more personal and specific. This combination with the fact that ethnicity is an account information setting will allow people to represent themselves better. I think this will also help with research you may have.