Get him smart toys as he's growing, like the thing you mentioned, like Lego, like Makeblock (http://www.makeblock.cc/), toys that encourage creativity.
I'm sure you can find great resources for kids to learn how to code, that's where you come in. He expresses the wish to learn how to code, you find out what's best out there to do it in his age.
My problem is that I don't know a lot of "smart" things. A normal offline toy shop does not have much to offer. And you have to know what to look for online.
Makeblock looks interesting.
When he's older, radio controlled airplanes, cars, helicopters, boats.
You could probably have a general DIY attitude and build some toys for him with him.
This looks cool too:
https://www.kickstarter.com/projects/infento/infento-worlds-...
As for Infento - looks very neat, a bit too "prepared" for my taste. We do such things from wood and stuff you can buy from the local hardware store. Here's an example of something we've built in a day:
http://www.amazon.com/s/ref=nb_sb_noss_1?url=search-alias%3D...
If he's already pretty skilled, he'll definitely be able to handle even the sets that are marked 10 years old +. I recall I had one of these when I was 6, it was a slight challenge but that was the fun part : ).