Pretty much. WM provides a nice damage boost for AOEs, but it is a slight loss of DPS on a single target due to the removal of auto-attacks.
I like the idea of a stacking attack boost for each WS you do while standing still. If it eventually goes up to a 20% buff, say at 5 stacks, that'd give a 40% boost to single target, making up for the loss of auto attacks and giving us a real reason to use WM on things besides large trash pulls.
