What did Satoshi see as the scaling solution for bitcoin? Is anything being done?

Did Satoshi foresee that the network would start choking under its own volume and that transaction fees and speeds would become such a problem? Did he propose a solution? And (real question) what is really being done to solve this? Are all the eggs in the lightning network basket? The only post from Core I can find is from 2015. Are any of the developers talking about a realistic and prompt solution to solve the scaling problem? Thanks in advance. via /r/Bitcoin http://bit.ly/2Cp7bgk