I don't think you have to worry about the next generation, unless they release it in August. The terms of the upgrade program say that you need to make 12 payments before you're eligible, nothing about a true calendar year. So in theory, as long as you get a new one in September you should be fine if the next iPhone is released in Sept/Oct.