"and when it’s time to switch servers (every multiple of 5 points). […] Once one player reaches the final score of 21 with 2 points clear, the system automatically ends the game"
It amazes me how long it takes for rule changes to propagate throughout the world.
Table-tennis has been using 11-point games for over a decade, with serve rotation after every two points (http://en.m.wikipedia.org/wiki/Table_tennis#Rule_changes), but I rarely meet recreational players who are aware of that, and that includes people who played it first after those rule changes were made.