Goffin edges out Tiafoe