Honestly, I would keep it as simple as possible and base it off of your contract. If you can sign a new 2 year contract (I'm guessing with a 3G you are due for one) for the i5 or within 2-3 months after the i5 is released, then definitely. This way you can skip the i6, and go straight to i7 when the 2 years is up.