Looking for a decently powerful laptop (16gb+ RAM) with wifi-6e that *isn’t* a gaming laptop

I’ll be using it primarily for creative and design work, from making music to modeling objects for 3d printing and other CAD work as well as maybe some light GIS work. I’ve got a headless rackmount Ryzen box with 64gb of RAM that I use for heavier GIS stuff, machine learning and other “big data” tasks that require such. For everything else though, particularly for graphical stuff, I’d want to use this laptop. I’d prefer to stay away from “Gaming Laptops”, as the last one I got had no home/end/pgup/pgdown keys (not just no dedicated keys, no alt-key combinations built in at all! I had to use some software to manually bind them!) which made the several hours I usually spend per day ssh’d into a terminal quite frustrating, and because gaming laptops seem to have lower resolution displays than I’d prefer, and none of them have touch screens which aren’t necessary but certainly a plus. My budget is ~$2000 or less, ideally.

Currently, the best I’ve found is the ThinkPad X1 Extreme Gen 4 Intel (16”)