Well, that Yoga C930 is actually quite new and it is an excellent laptop overall, plus the OEM battery is something like $80. The old battery in fact gives me about 4.5 hrs, so no rush, really.
Overall, I'm no longer inclined to buy laptops with hot-running CPUs and large batteries, because my use is under-utilizing everything. Just ordered a very curious Chuwi laptop for my gf. It's supposed to be very light, runs Celeron N5100 and promises 7-8 hrs with something like a 35Whr battery.