Yes divers should be in better shape, especially as many are well not exactly surfer dudes, nor 20 somethings, perhaps divers like drivers and pilots should be subject to periodic recertification especially the swimming tests. Perhaps PADI or the other agencies could develop fitness standards and routines for self evaluation.