That's my intuition as well. I'd expect AGI to arise once we put together enough various tools into an integrated whole. So for classification of sensory input, you'd build in a CNN or the like. You'd build in something else (RNN?) for NLP. You'd use something else for planning (which might also work as the highest level controller determining "what sort of tool should I apply to solve goal X?"