Totally - but is the AI development of robots included in the timeline for what you're calling AGI? Can we get to AGI without having those robots, and then the AGI designs them?
I think they'll ultimately go hand in hand - this is more just a question of what we're defining AGI to be and whether robotics should be mandatory as part of the stated definition around doing 95% of work.
The AGI will have to run the robots, problem solving when things go wrong is what allows humans to run large organized endeavors without getting stuck, you need AGI to do that for generalized work. Before AGI robots will only be able to handle tasks with very simple error scenarios, and will still need humans to look after them for the rare cases where things go more wrong.
I think they'll ultimately go hand in hand - this is more just a question of what we're defining AGI to be and whether robotics should be mandatory as part of the stated definition around doing 95% of work.