I normally like to switch companions around and often, when I got someone new, I put them in the party, to see, how they are. So as soon as I got Wyll, I switched him instead of Astarion. And I ended up using Wyll the most with SH and Gale, despite me being a warlock in that playthrough too. I didn't have trouble encountering him either, since that cutscene, where he trains the kids, always triggered really quickly for me.