The 24-time Grand Slam champion avenged last month’s Madrid Open loss to the Italian and will next face Britain's Cameron Norrie, who rallied to defeat Australian Alexei Popyrin 7-6 (8-6) 6-4.