Speaking of which, you should base the teams off of the Origins anime. It was shown that Brock had multiple different sets depending on how many badges the challenger had. I doubt people will be going to the same gyms in the same order.