Sorry, water still wins by a long shot. If you restrict it to overland transport rail is king. When you look at cost per mile*ton (or kg*km if you prefer) water costs pennies, rail dimes, and everything else dollars or tens of dollars. Unfortunately it's rather challenging building a navigable river across a mountain range, for some reason they all want to move downhill.