It's starting to look like I might need a Mac laptop. The good news is I can wait until WWDC. The bad news is I don't think we'll get new keyboards... Eep.
@rosemaryorchard Nope. They're going to dig their heels in on this one. I'm actually going the iPad route (to bring in the lightness and pencil support) and extend the life of my current machine until I hear better things about the keyboard.