Don't abandon advertising that's working - but keep trying to enhance it.
As well, each province and territory has the rules. And, your relationship is unlikely to work through the wave goodbye as the friend returns in their car to go home.