I am in the same shoes, I had 800 (first flagship Lumia) now 920 (still love it, never had any issues as others did, no dust, great battery life, no screen flicker issues, very rare random reboots and I even changed the body from white to yellow myself, all prefect and now it rocks WP 8.1 with no other issue than some little bugs but in apps department.
My thinking is that 930 is a defo for 920 users and it should serve them as well as 920 still does. 1030 is more obvious for 1020 users. Guys think clearly there isn't anything special coming other than 1030 and 1530 also I think that Nokia may release less devices this year because 820 and 720 weren't selling very well, so my guess is that there will be 530, 630/35, 930, 1030, 1530, maybe 1330 but doubt it and there shouldn't be any 935 since 930 already has aluminium frame.
Out of these only 530, 930 and 1030 will matter as it was the case this generation so the choice is this : 530- price, 930-true flagship with balanced specs, 1030-improved best camera phone alas still bulky. I am obviously going for 930 (even tough no Glance Screen Support but the new customizable Lock Screens will do!)