I don't see why any rule change is needed. Since Richard has clarified that nothing prevents each district from bracketing 5 men into round-robins I don't see why we would even have to mess with the rules.