I think you might be leaving out some important leaps that will occur in solar cells and coatings and even compact fusion. A miniature fusion engine could completely obviate all concerns about power for any type of craft or transport system. Anything is possible with enough smarts and AI is about to become trillions of times smarter.