That's less a question of finding the "right" cordless drill and more about your budget and priorities, to be honest. Festool is excellent, but also noticeably more expensive - whether it's worth it for renovation work in your own apartment is debatable. With Makita and DeWalt you get solid quality for less money, and both brands last forever.
If you're working a lot on the ceiling, I'd really pay attention to the weight. Look at the smaller 18V models, not the big 20V variants. Makita has some good lightweight drills, and the batteries are really reliable these days - your old tool doesn't even know this better generation. DeWalt is similarly good, but often a bit heavier. The most important thing though is that you're already coming from Makita and probably still have batteries lying around. In that case it makes huge sense to go with Makita again instead of switching to a completely new system.
As for battery performance: with modern tools you don't need to worry about that. Just get two batteries, then you always have one charged when the other runs out. That's more practical than betting on a single battery lasting the whole day. Especially for renovation work, which often happens in spurts anyway, that's completely sufficient.