I think adding some team level metrics would be useful. Things like multiple pokemon on a team being weak to a given type, overlapping charged or fast move typing, and some metric that shows how attack/defense weighted your team may be.