How about a really modern Pentathlon?

The olympics are on and sports are on my mind. I find the Modern Pentathlon very interesting. Its origin is in the ancient pentathlon when competitors had to run,wrestle,long jump and throw a discuss and a javelin ; all skills needed by a Greek soldier. The modern pentathlon was created to test skills needed by a 20th century cavalry soldier behind enemy lines - fight with sword (epee fencing), pistol, ride an unfamiliar horse, swim and run cross country. Now while running and shooting are still essential skills for a soldier cant say the same about horse riding and fencing. How about a really modern pentathlon which would consist of cross country running with stops in between to shoot at targets ( you can take all the time you want to shoot but your clock on the run is ticking). This could be preceded by a 200 m snorkelling event ( sneaking up under water is something a modern soldier will prefer to swimming in). This could be preceded by a parachuting contest where you are judged on your accuracy in landing and the final event could be testing your skill at unarmed comabat - Judo, wrestling or Karate (choose one). So the complete sequence would be you jump out of a plane and maneovour your chute to land on a bullseye in the stadium. You then snorkel 200 m with penalties for surfacing. Based on these two events the next day you get your starting times in the cross country race cum shooting event ( the shooting could be sniper rifle or rapid fire pistol) Based on your ending times you get grouped into pairs for Judo so that 1 and 2 fight for the gold, 3 and 4 fight for the bronze and so on). If we want a heptathlon we could add Shotput to simulate throwing grenades and a separate rifle event to simulate sniping and have pistols in the cross country event.