There is no open ended energy requirement. The annual revenue from mining puts a limit on the expenditures for the network. If anything as time goes on the move towards FPGA (higher capital costs and lower energy cost) which further limit the energy cost to maintain the network.
Were bitcoin to grow into anything of consequence, scalability would still be a factor. Viewed in this light you are correct, it is most likely a non-issue.