Best MH affix for increasing Whirlwind damage?

If I wanted to maximize whirlwind damage, what is the most desireable MH affix? Is it +weapon damage? The codex formula for DPS makes it seem like +ED % is the best overall DPS modifer because it is mutiplied against the calculated weapon damage and THEN elemental +damage is added.