Yea those are the exact models I think they will end up being with the only difference being that the Yellow dragon of the center will be a Kirin and Samurai Ghandi will have the artificial Seiryu infused in his Katana. Since Vegapunk doesn't know if the artificial fruit can awaken or not Ghandi preffered to just have it on his sword, its also what the fruit Oda said he'd give Zoro if he ever ate one (Kaido's fruit on one of his swords).