Which team is the best, France 2016 or France 2018?

After losing against Portugual in the final of Euro 2016, are France in better shape two years on to win football's ultimate prize?