I agree, but given the past trends they won't change the design until a completely new architecture.. However, as you pointed out they could bump the graphics card.
Given the choice, I'd buy now. Waiting for an upgrade is all well an good but when it doesn't materialize then its highly annoying and, like I said before, it'll just make the time to the next upgrade even smaller.