> It seems this problem should be addressed by more energy-efficient Bitcoin mining rigs and changes to the Bitcoin system to improve efficiency over the next 1-2 years.

Not really. The miners calculate their costs versus their gains. If a new rig consumes half of the electricity, they will just buy a second one. If they don't their competitor does.