My recommendation is gym leaders and challengers use the flat battle rule depending on pokemon lv.