I went into the store yesterday and spent about half an hour playing with the touchpad and typing on the keyboard.
I made sure to adjust the force touch keyboard to firm, and I tried three different MacBooks and 2 different MacBook Pros. The MacBook Pro simply has a nicer force touch keyboard. Either the design is somewhat different, or else it's just implemented better on the MacBook Pro. The firm setting on the MacBook is OK, but it just feels nicer on the MacBook Pro. Both on the medium or light setting suck though (although the medium sucks less on the MacBook Pro). It's as if the MacBook Pro's firm is like the MacBook's firm-and-a-half.
The keyboard on MacBook drove me nuts. It just doesn't feel right. The travel is too low. The concave nature of the keys I can easily get used to though.
Furthermore, while the PCIe SSD of both machines is amazingly fast, application launch times are noticeably faster on the MacBook Pro. Office applications on the MBP just snap to attention. On the MacBook, they load quickly, and much faster than my Core i7 at home, but there is still a bit of delay. Nothing to complain about, but when you use the MBP and MB side by side, the difference is noticeable.
Overall, the comparison made me really reconsider the MacBook, and maybe consider just getting a MBP instead. The main problem with the MBP is the weight. 3.5 lbs is OK, but in the greater scheme of things, suddenly doesn't seem like that much of a weight loss when my current MacBook is 4.5 lbs.
Thus, overall, I'm kinda inclined to wait. If the MacBook 2.0 doesn't fix some of the aspects I mentioned, and if the MacBook Pro doesn't shed some weight, maybe I should just wait even longer.
The best form factor for me was the MacBook Air. Unfortunately, its lack of a Retina screen made it a non-starter. The difference was really, really noticeable.
tl;dr:
1) MacBook Pro is beautiful and super fast, but weighs too much at 3.5 lbs.
2) MacBook is beautiful and super lightweight but has an annoying keyboard and trackpad.
3) MacBook Air has great form factor, but the screen simply isn't good enough.
Thus, I will stick it out with my SSD-endowed MacBook Pro from 2009 until something better comes along.