I just sold my 1020 and got 930. And I just LOVE IT.
Yes, camera is worse. But hey, 1020 has the best camera ever, and 930 is still very good, just not amazingly good.
But 930 is much faster, much better to hold, extra 0.5" of screen space are very significant. And it's futureproof.
So yes, 930...