I don’t mind the different events for swimming, track, etc. I can’t tell if the OP’s suggestion is serious but that’s an incredibly dumb idea. A team medal in addition to individual would also be cool though (even if just based on points from the individual results).
But it doesn’t seem fair that multiple athletes from the same country can qualify in those sports but not wrestling. I imagine there are less transfers in track and swimming? I know there is the pole vaulter dude competing for Sweden, but seems like there were multiple reasons for that, and I believe he actually trains there.