Whirlwind should be strength since Whirlwind is undoubtedly a melee attack.

When you say normal damage, did you get that term from the damage-boosting weapon enchantment? I'm about 90% sure that is, indeed, a part of melee damage. Otherwise, it should blatantly say magic damage.