AGI is Data in Star Trek TNG - trying to be human, making decisions to want to be alive, eventually dreaming and finally using an emotion chip. Another alternative here would be Moriarty or the various doctors in Voyager.
AI is the Ship in TNG - lots of heuristics to figure out what the user is trying to do. Past usage of commands and relating major events outside the ship with algorithms for battle, life support, etc.. Events categorized by importance and automatic handling to save lives when necessary. Basically an extremely advanced Siri that doesn't really misunderstand you - while at the same time not really caring about you or knowing anything about being alive other than the priorities built into its software.
I think for the next 100 years we're going to have AI progressing like the ship in TNG. I don't think we'll have AGI until maybe 100-200 years.
Then again when I was born no one had a fucking clue eventually we would have something like the iPhone and talk to someone in China with <1 sec lag. So my estimates could easily drop to half.