Batteries also increase technologically...hopefully at a better rate than the power usage will increase for these CPUs...
Not really. Batteries have been pretty stagnant, especially relative to the electronics they power.
Most of the increases in battery life in recent years have been due to power reductions and meaner batteries (not necessarily better batteries).
Wake me when we get laptops with fuel cells.