Yeah, and technically you can put up the shield and wavedash with the same trigger if you wanted to. But a lot of people (myself included) find that to be tougher. Just use whatever is more comfortable for you. And when you wavedash OoS, be sure to press the jump button first to cancel the sheild. As long as you do that the rest should fall into place rather easily.
I just realized that I needed to start WDing OoS and can do it rather consistently now. If you could WD with no problem before now, it won't take you more than a week to start WD OoS without breaking a sweat.