First match since Roland Garros set for Alexander Zverev and a savage Round 2 may be waiting