We now know that there won't be a Kindle2 this year, see
No New Kindle Til 2009, but there are likely to be several new Kindle models released (early?) next year. I expect the Kindle2 to be a major improvement, but we don't know when it will arrive and the existing Kindle is good enough from many purposes.
The only issue with the Kindle might be your "tables and graphics". One way to tell would be to convert them to MOBI and look at them with Windows MobiPocket Reader. MOBI table support isn't good, but graphics may be ok. If you are building the images yourself use about 525x640, see
Kindle Automatically Doubles Image Sizes.