It'll get more efficient now people aren't upgrading. Software will be exactly as efficient as it needs to be to run on most peoples computers.

I don't think that's true - instead software will be exactly as efficient as it needs to be to run on the developers workstations. And companies throwing sky high salaries at software developers aren't as price sensitive when it comes to those workstations as the average user.