Whirlwind would not necessarily give extra action points, that would mean someone could run across the field real fast which was not what i intended. and the combo you mentioned for the second isn't possible because you can only get one heroic ability, right?
I know that the second is impossible. I just noted that it's two existing abilities rolled into one. It could be a better combination, as just high Attack is rarely enough to make a mediocre commander useful.