I think it is reasonable to say that diving is a separate sport. Of course, scoring is combined for team competitions at the high school and NCAA levels. That seems reasonable, just as keeping them separate would also seem reasonable. In team scoring at FINA World Championships, the ISL, and Pan Pax diving is not included in team scoring. At the Olympics, of course, TeamUSA counts swimming medals and diving medals as different categories, as separate as volleyball and canoe slalom.
That said, we…