I think we should definitely have an obstacle race in the Olympics, be it swimming or on land.
It's the only time I've ever not come last in a race - 2nd place in the (land) obstacle race in my last year in primary school - made just enough difference for my house to win the overall competition, too, so I was very proud

Not quite sure to this day how it happened, mind you.
On a similar theme, crazy golf would be very entertaining to watch...