Part of the summer will involve vacation of various sorts, which means grinding through lots of pictures, which is one of those CPU-slamming sorts of activities. I guess this has me leaning toward "live with it until WWDC then order right away".

Replacing the old battery might be useful, but it's not critical. I'll basically keep this machine in reserve until it dies, then trash it. (My 2008 MacBook Air was serving as a print server until its battery inflated, distorting the aluminum case. Right, shut that thing down before it catches fire.