Thanks for the tip. Will checkout macbook pros at a local store.
Keyboard fix: call Apple. Lots of times employees in Apple stores are too busy to spend the time it would take to properly diagnose a problem .
non-apple product: in the US, hit big box stores, Costco, Office Max, best buy, pound on the keys, look at displays carefully. You have to spend time with a laptop to discern if the KB, display, heat, fan noise, etc are all tolerable in your workspaces. Those are my top deal-killers (always carry a couple mice around with me, never use trackpads, ) Some places (Costco, target) have 90-day return policies