Moving up from a T470 - what's out there?

[ExtensionCable]

Hi all,

I bought a T470 at the tail end of 2017 and have been very happy with it, in fact so happy that I stopped reading up on Thinkpads after I got the machine in my hands. However, it has been rather anemic in terms of processing power for the work I do right now (simulation). Now usually I use the clusters at work and my workstation to get things done, but I think an upgrade to my personal machine would be good as well.

The T470 is currently set up as follows:
i5-7200U
32GB RAM (2x16GB)
Samsung 960EVO SSD
LTE chip
48Wh battery

What I am currently looking for:
Simply put, I am looking for something that has a relatively high number of CPU cores/threads for a laptop, with good sustained performance under load when plugged in.
Do not care about gaming capability. Expandable RAM is a must. Battery life should be relatively long when used for light task e.g. e-mails and Excel. I do not need to get the latest and greatest, though it seems that the latest releases are the ones with the big core counts. LTE capabilities and swappable batteries are a big plus.

My main concern right now is that I risk getting something that's advertised as high performance but in actuality only in possession of a padded spec sheet, e.g. something with 8 cores but exhibits throttling after 3 seconds under load.

My question to you all: what specific models or series should I be looking at and comparing right now? Cost is always a concern but I can weigh out the cost/benefit for myself later.

Thanks in advance.

[RealBlackStuff]

Have a look at the latest P14s Gen 2 (AMD).
CPU: 8-core AMD R5-Pro-5650U or R7-Pro-5850U
GPU: AMD Radeon™ Vega
RAM: 16GB soldered + 1 slot for 8/16/32GB DDR4 3200
Battery life: ~14 Hours
WWAN: Quectel

Also with Intel CPU here

But wait a few months for the prices to come down.