Thanks for the reminder. Yes, I have a lithium battery (new one that I installed myself) but I always do carry-on with it.
This is where (literally) thinking outside the box pays dividends. Right now you have two or three heavy boxes -- your luggage.
Apparently nobody wants to hear that you can travel CONSIDERABLY lighter, and have more fun doing so. I've been at it for decades now. And I would cheerfully have a "travel competition" with someone who insists on bringing two checked bags, and the maximum carry on to any country on Earth. Pick it. Doesn't matter to me. China? France? Morocco? Kenya? No problems. Score the trip this way: Minutes spent enjoying the vacation divided by minutes spent waiting in line, carrying bags, dealing with bags, getting around with all those bags.
Overpacking (and trying to do too much) leads to a cascade of failures which makes the trip worse and worse -- rushing to the next connection, hauling stuff around, always being under the gun. I'm astonished that more people don't keel over on vacation -- they're clearly running themselves ragged.
I can make the same argument for rail vs. rental car in countries which have a robust rail system -- rail is faster, easier, cheaper and less stress. A win all around. I tend to take my single little bag to places with robust transportation systems. It also makes a dandy pillow when necessary. And if I'm in the sort of country where it's hitchhiking and dodgy buses, packing ultra-light is better than worrying about 100 pounds of stuff
and worrying about what's happening in Uganda.
It's been my experience that most people don't just want to do things the hard way, they chafe at the notion of doing things the easy way. No idea why this is. But that's what I see when I travel.