Shapovalov's US Open star rises with win over Edmund