Yep, its pretty much crystal ball time. Past naming trends can go out of the window 2000 series and 3000 series were the same then the 4000 series changed it about a bit, the 5 series seemed to settle things down a bit then it all went out of the window again with the 6 series.
Personally I wont be taking anything for granted or assuming too much until i see the silicone tested this time around.
I wouldn't hold out too much hope of a new launch in numbers before next year from either side. AMD will probably all but paper launch hew cards with a few scattered about to select vendors. Nvidia pretty much cant get anything out until next year if reports about where they are in the process are true.
So its possible you could get a new AMD card but which variant, High mid low even Mobile. Your guess is as good as any ones.
Mactronix