Keyboard layout matters. I used to type around 80-85 WPM on a standard keyboard with QWERTY layout. A little more than a year ago, I started getting into custom mechanical keyboards and built a split ortho Ergodox and switched to Colemak all in one go, and have had to re-learn how to type. You can see my progress here:
https://www.keyhero.com/profile/yuhe00/
As you see, I'm quite a bit faster now then I was before. Not to mention the added benefit of reduced risk of RSI. It's been an interesting experience to completely rebuild muscle-memory. For the first month or so, I was not very productive, but it was during a not-so-busy period ;) In my opinion, it's a good investment for anyone who types a lot as part of their profession.