Soldato
Ya you might want to consider a 12 or 16 core threadripper. That workstation you have at work has 16 threads. If you buy a mainstream i7 now, you'll get 8 threads, and if you buy one at the end of October you'll get one with 12 threads. Threadripper offers up to 32 threads at prices that destroy Intel equivalents, and lower power draw too.
I'm just not sure a 6 core i7 is going to cut it for you. Certainly it'll be better than your current i7, but with the kind of work you do you could get so much more performance.
If you mostly gamed and farted around in CAD on the side, then ya get the i7... but if you do it for your actual career... not so sure.
Or he could just go with an 8 core Ryzen r7 seeing as his work pc is 8 core. Of course he can go for Thread Ripper but it is going to mean cutting down in other areas such as the gpu/monitor etc.