There is a very solid chance that Oda makes Zoro top 2 by EoS
But there is zero chance that he will be made outright stronger than his golden boi Luffy. The best you can hope for is to have Oda make it ambiguous between them by having them around the same level.
************
Anyway, coming on topic.
I am not completely sold on Zoro vs Kizaru happening. As always, Luffy tends to be the first to do anything - was first to beat Yonko, will probably be the first to beat an admiral as well, going by precendence.
I'd say 60-40 in favour of Luffy, when it comes to who will fight Kizaru.
As for the rest, yeah I can see them. Shiryuu and Mihawk are obvious. Bald gorosei seems to be for Zoro too. I can see the "death" fight playing out too, giving the thematics of Zoro.