I dumped the awful Apple keyboard at last and got a mechanical one. It’s not the Das Keyboard Professional I would have liked (too expensive) but this is a decent alternative.
It’s branded as TopElek Mechanical Gaming Keyboard and made in China but I’ve seen the same one with different brand names. Despite that it’s a solid keyboard with nice clicky keys. I had to make very few changes to mirror my Mac muscle memory and I can see a huge improvement in my typing speed and accuracy already. Happy.