Apple's desktop options are actually quite strong right now.
If you just want a really powerful desktop computer for dev work - get a souped up Mac Mini If you want it with a nice screen - get an iMac Pro If you're a video professional - get a Mac Pro
The Macbook Pro keyboard situation is a garbage fire, though I will say that I'm quite happy with my 2016 keyboard after it got replaced for free through the program.