Ag - dude/dudette/du-nb, put yourself out of your misery, get this and get some work done:

https://www.ebay.ca/itm/Lenovo-30D1000UUS-ThinkStation-P330-Workstation-Intel-Xeon-Quad-core-4-Core/353406194428

There are a few floating around the Bay as we speak (a couple hundred $ more than what I linked).  I was eying the above, even though I can't really justify the purchase, and the "rationalization" nevertheless did not prevent me from low-balling an offer ... the specs were just too tempting.  Impulses from the reptilian parts of the brain are hard to overcome indeed. 

I already have a perfectly working P320 and Z2 mini G3 - both new old stock.  I only buy computers that are new old stock, or even lightly refurbished. 

Literally you can't afford flaky hardware, as you said yourself.  2021, with the flood gate of money coming everywhere (not quite in my paycheque, however), and with the general flakiness going around in places that supply electronics, you will get worse copper wire, worse capacitors, worse drivers, worse everything if you buy this year's models.  

Your Surface Book 3 is a testament.  

I even scoured the net for an NOS TS150 server a year ago (why that particular model?  For it's the only entry "server" that has driver support for Win 7/10 at the factory level, and none was floating in the Bay, still none today - at least not "new" or NOS).

All those who buy consumer grade hardware this year (XPS, IdeaPads etc.) will come here and cry.  And your SB3 is hardly "consumer-grade"!

Mark them words.