We got a big waterway toy for my DS's 2nd birthday as well!
The biggest thing for him from about 2-present though is his Brio train set and buckets of cars. A big plastic tub filled with 20 matchbox cars will keep him sitting amused for AGES. He sort them, lines them up, races them, talks to them, pushes them, etc etc etc! HOURS!