With a new Mac you will get the latest iLife apps, so there is one bonus to getting a new machine.
I hear you on the laptop keys thing. I use an eMac at home for my main machine. Over this past Xmas, my wife got the family a very nice HP Laptop which she gifted to me to sort of make it known to the kids it was the family computer, and not just my oldest daughter's machine (although she monopolizes it most of the time). Anyway, while it is a very nice computer, I am not very comforatable typing on its keyboard, ESPECIALLY if I am holding it in my lap on the couch. It is a little better when sitting at a table, but usually when I want to get on the computer, I head upstairs to my trusty old eMac and its full size keyboard.
Although keep in mind that many laptops (I assume Mac as well?) can use external keyboards, so at home at least you can use a full size keyboard and then use the laptop keyboard when out and about. Just a thought.
Patrick