Preserve wave type when randomizing