This might sound like troll speak, but I personally think iOS 8 is going to be the major revamp. I think iOS 7 will see some slick minimalisation of the cheesy stuff that has been growing on iOS, but that will only really be a high level change. It might signal a new design approach for apple, but a change in how we use the device will come a little later.
Consider the fact that OS X 10.9 (presumably coming next year) will be the last version of OS X and since the introduction of OS X there has been a paradigm shift in the way people use computing devices. Mobile and specifically touch devices are proving that they can replace 90% of what consumers use computers for (the needs of content creators in the business and creative fields is a different discussion altogether)
Dare I say that Windows 8 has taken some brave steps toward Apples much vaunted "post PC" era, but in typical Microsoft fashion they're fumbling it. High software price for an upgrade, a botched tablet launch and this glaring disconnect between metro and the traditional desktop make it an uncomfortable attempt to capture two audiences while satisfying neither. Which is a shame because if they can convince devs to write apps in Metro they could have an incredibly powerful force against google and apple.
So while we have this somewhat vague integration between iOS and OSX, (apps that sync with each other and such) it's really reactionary to the rise of iOS rather than it being an experience created to suit this change in platform and usage. While I have no idea how they can solve this, it feel like the integration between your Mac and iOS experience could be seamless, if only someone figured it out properly.
And so with OS XI on the horizon in perhaps 2014, I think we'll see a major shift in how both iOS and Mac OS work, to the point that one day the experices will be the same. I get the feeling this will require a painful change for the average desktop user and desktop devs, but that the fundamentals of content creation will still be present. If anything it's easy to change the desktop experience with apple pushing 'full screen' app experiences, which really just leaves the big issue of file handling and input methods.
A rather off topic ramble, but just my two cents.