Don't sweat the battery, they're removable, upgradeable to larger ones if you have to go a longer time on a charge and easy to replace. For the change left over from $2000, you can buy lots of them!
Yet I almost see a fetishism around these machines I don't truly understand. 1080p, 60hz, 250nit, 16:9, 54% sRGB is the most common config you'll see and I really think on a 2 grand budget you shouldn't put up with it when purchasing new. This is also just a Lenovo thing, the Elitebook from the same year was 630nit 88% sRGB and the funny thing is that Lenovo probably only saved 10 or 20 bucks stocking this crap based on the price of replacement parts. On a 2 grand budget I'd spoil yourself with something better.
I've stopped buying new laptops and now I use refurbished Thinkpad P50 with i7, 64GB RAM, 512 SSD for ~1100 USD.
If I need to do something really computing intensive, I rent a cloud VM ;-) Actually, I've one for each project I'm working on, and I scale them as/if needed.
You get them decently refurbished on ebay as they are popular leasing models for companies which switch them out more or less on a fixed schedule. If you're lucky you get one that was sitting in a docking station for two years and is almost pristine, just the battery destroyed because it was on AC power uninterrupted.