I would hold off and wait for Kindle 3 it can't be more than a couple of months away.
Maybe we need a buyers guide like Macrumors has -
http://buyersguide.macrumors.com/
A lost of all of the popular reader devices with their revision history. If we see Amazon getting into the habit of a yearly refresh, we'll know when to expect new versions.