What do you think of going back to "Contact Type" for this? The dropdown doesn't affect the fields displayed for Contributions, Activities, etc.