I will be honest, as great as that was and flying in the face of all logic, I dont think he learned his lesson. Based on his expression at the end, I think he needs to get told again.
Also, I like that he fumbled trying to flip the drink around because it gives the other guy more time to talk shit and build his ego which is about to get smashed. I dont think the smash hits as hard if he doesnt fumble flipping it. I think he was about to kind of pump fake with it and tell the guy to hit the bricks, when it falls and the guy tries to kick it, he puts his whole arm into it when he gets it back.