I've just had an idea as to why there is no 2800X, yet. AMD are waiting to see what Intel do with their Z390 8 core, with that the 2800X could be higher clocked than the 2700X.
You are right. With 100% certainty, AMD will keep the best chips for higher models - Ryzen 7 2800 maybe and Ryzen Threadripper