If you can do without for now, just wait. September is not far off now, and we should have a better idea by then if an update is coming out. If not, you can then make your decision (i.e. continue to wait, or just get a 2G cheap). Personally, I'd wait for the new hardware, not for capacity reasons, or a pointless camera, but for the faster processors.