I hope so too, even if i would understand if zoro kinda replaces him. Sounds strange, but with a good flashback of zoro it would be plausible. But lets see what happens.
Just, with every Picture of him, it seems more likely. Last chapter it was exactly the same sword, for example, not the...