Unless you have a bad back, I recommend sending the X1 back and get a P52 or P72, with a nice fast GPU, and with Lenovo, you will have to get the top-shelf CPU, with makes sense to their marking departments.
The X series just doesn’t have the cooling capacity that a workstation/gaming class notebook computer has. Even the P52 has 2 fans and heatsinks, but can share thermal loads for short periods of time.
Upgrading the processor will likely make the computer faster, but it will unlikely come with an improved cooling system. In a small way, having a faster processor might marginally reduce the heat-soak placed on the thermal-mass, but likely that will be even less than the increment of your processor upgrade. The fan(s) still have to get all of the heat out of the computer, and the X1 likely only has one, and not as much copper to boot.
Often in notebook computers, it’s not only the highest possible processor clock, but how long that processor can run at the clock over time. Even though the higher Xs have an nVidia GPU, as soon as you start a CAD/Design program, that GPU adds to the heat that the cooling system has to deal with without making the CPU throttle.
[When I start Rhino with the GPU on W540, heat just oozes from the fan across the table. Modern GPUs are much faster than the K2100, but modern CPUs are not much faster per clock. Now, you might have 6 cores, that heat still needs to get out.]
When it comes down to it, there are very few notebook computers that can render using a GPU or export video also using a GPU and CPU for an extended period without throttling, because even gaming laptops, while they are design for heavy GPU, they aren’t designed to also run the CPU at 100% clock, over the hours that it takes to do CPU/GPU animation or HD/4K video exporting using both GPU/CPU.
You likely need or at least want a bigger boat.
With things such as real-time raytracing, the idea that you don’t need much cooling capacity for the GPU on a workstation is no longer true.
For memory, I recommend buying only what you need from Lenovo, but choosing it in big sizes that don’t have to be repurchased. Though, if the RAM sticks aren’t in pairs or quads or whathaveyou, then the memory won’t be able to run multi-channel, dual/quad, respectively.
There are also Dell Precision workstations, and several “gaming” computers such as an Alienware, would also make good design computers, albeit, heavier and a less livable than something like a P52. I would avoid the P52s for the same reasons. Oddly a fast 14 inch with a GPU would have made more sense in the field than the table-hogging p52s.
If you repurchase from Lenovo, and sign up for for their mail-list, even if you have done it in the past, you still might get a small discount coupon number. The Depot warranty is a good selling point that I’ve needed several times.