In the same boat as you. If Apple doesn't fix this horrible keyboard in the next release, I think I'll finally switch to ThinkPad.