British number one Kyle Edmund backs up his win over Novak Djokovic by beating David Goffin to reach the Madrid Open quarter-finals.