I'm in a similar position with my 2018 13" MacBook Pro. I want a working keyboard again and I have no interest in a 16" (13" is the perfect size for me) but that doesn't seem to be possible.

I'm also a little more out of luck because I'm looking at switching over full time to BSD which I've used on-and-off over the years for a desktop and consistently on servers.

Thinkpads seem to consistently be the go-to and currently that's where I'm at, looking at a few different models. Also came across System76 and Purism and haven't totally ruled them out yet but probably won't go with those for different reasons.