If photography is your main focus, if you accept no compromise, go for the 1020 (but as said, not on contract).
I switched from the 808 to the 1020 in March this year, as Symbian started to die (changing APIs, services stopped one by one).
I just love it, because of WP (mainly), because it's fluid and because of the camera. 41MP, OIS and RAW. Wow.
It's slower to capture, yes, but it never annoyed me. Its camera won't get improved by Denim or subsequent updates, but it's not a problem to me.
Battery life: 4G/WLAN on, localisation on, my battery life is 1 day and 15 hours. And I do use it, I promise
This being said, all this is valid if and only if you need that 41 MP camera. With all due respect, but if it's to shoot sushis and feet on a beach, it would be overkill lol.
To be serious, we know that the 1020 will get all the GDR of 8.1 (and it's the most important, camera improvement is an extra to me), and probably Windows10 too.
The other way to tackle the question is: if you're into photography, you don't have a big choice. 930 or 1020. So again, if the sensor of the 1020 is what attracts you in this device, you don't have another choice than buying it until something better comes.
When I say something better, I don't know will there be a 1030 based on the 41MP product line, but as the 808 wasn't a boosted Nokia N8, the 1030 could go beyond the 1020 by introducing another technology/solution.