Also the rumors about a retina display are just that, rumors. It will unlikely that the 2nd gen will have that because it would make the cost of the ipad to prohibitive.
I suggest an ipad. You clearly have a use for it now and the next one isn't projected to come out until April 2011. You will at least get 6 months of use out of it and if you take care of it, you may be able to get a good price selling it used if you really want to upgrade to the 2nd gen.