Personally I'd rather see Wyrm Wave only proc when you use spells, with its damage adjusted accordingly. The same thing should be applied to pets too eventually.