Looking to like-for-like my XPS 15 9500

Hi

Currently I have a 5 year old Dell XPS 15 9500 i7-10750H 32GB RAM 1TB NVMe GTX 1650Ti

It's never been great given the specs, and I've so far had to do two full keyboard/mouse/top assembly replacements due to keys slowly dying, with signs that it's about to happen for a third time.

I got it "renewed", so I'm wondering if it was damaged before I had it. The battery isn't great any more, it overheats, it's sluggish (even after a fresh reinstall) and I'm just becoming aware of it's age.

The thing I like the most about it is the trackpad, then the screen. The trackpad is huge, responsive and I love it, the screen is super bright and 4k.

I use it for work (self employed IT engineer) as well as for home use, and it goes EVERYWHERE with me. So I'm looking for something of similar modern day spec, something as portable, something with great battery life.

I'm almost tempted to look at a Macbook, but I work primarily with Windows systems day in, day out, so I think I'd struggle.

Big responsive trackpad is a must, bright 4k screen is a must. I'd like a keyboard that has a number pad but I've not really struggled without one to be honest.

Budget isn't an issue.

Thanks!