Good question OP. It is often tough to figure out when to buy an Apple product, especially with all of the rumors (September iPad3? October iPad3?). I'd say you made a good choice getting it now, because we probably still have several months before the iPad 3. Even in a worst-case scenario, if you bought it now and they came out with the iPad 3 a day after your return period ended, you could still get a good price for it and upgrade (if you wanted to). It is a great piece of equipment.
Something else to keep in mind is Apple's phenomenal support for products after-purchase. My iPod actually got BETTER over the years with new iOS updates, and this pretty much convinced me to get the iPad, and later the MBP. I think it is called the Apple halo effect. Anyhow, the point is that purchasing an Apple product is a pretty safe bet, no matter when you do it.
I am still waiting for Amazon to update my Kindle DX instead of leaving me behind for yet another product cycle

I don't want to derail the thread into Amazon bashing (I actually like the company a lot), but one reason I would never buy the Fire or recommend it is because of the lack of updates given to the DX. And, worse than that, the total lack of transparency about IF there would even be updates (many kind, but frustratingly vague responses from Jeff's office, the Kindle team, and others). With Apple you know. That is a big deal (to me).