Probably should get used to the keyboard if you ever want to upgrade to a new Mac. Have you used the new Magic Keyboard yet? Same type of keys. I'm sure the next MBP will have them too to bring everything in line.
I was going to buy the MacBook today, but just couldnt get used to the keyboard. Therefore I checked out the new magic keyboard, and it is loads better in terms of travel. You do notice that the key levels out a bit sooner than the older style magic keyboard, however whilst typing on it at the Apple store, It felt fine, and I don't mind if the magic keyboard 2 design comes to the new rMBPs/MBAs. The MacBook keyboard literally has no travel, and my fingers began to hurt after.