I think you want a consumer machine, not a business one.

I don't know of any of the current-generation professional-line machines that have USB-C or Thunderbolt; some of the mobile workstations do (although Dell's are still "optional, coming soon.")

As for the keyboard, are you saying you want to go back to the older Thinkpad design? If so, other than waiting for the Retro Thinkpad that may or may not ever come, you're kind of out of luck (and ditto the odds of anyone else going back to a traditional full-7-row design are quite low.)

Compared to most of the consumer machines' stripped down keyboards, it's a pretty good one (which is a low bar, I grant.)