I remember going from a 2015 with the god keyboard to the 2017, and it was absolutely god awful. I stuck it out because I needed the extra HP of the 2017 at the time.
On my 2019 it's SOOOO MUCH BETTER. Give yourself time. Also, if you work at a desk any more than 40-50% of the time, get the new Magic Keyboard. Those still use the old mechanism, and it will feel great. I got the space gray mouse and keyboard to match the space gray of my machine, and it feels like I'm using my 2015 all over again