SN Shapovalov finding his game ahead of his return to Canadian soil