I think the simplest solution is to allow auto attacks during WM. WM should be a straight 20% dps increase for the inconvenience of standing still and a cast time. Adding in a dps decrease by taking away auto attacks (estimated at around 20%) just makes it a push at best.