I like it just fine the way it is.  It is just too predictable.  You have to change things up and make yourself some rules that lead to a better match. In WL it could be no players over 80 speed or whatever.  You can keep it interesting.