@nik87 I actually really like the suggestion for Zoro to return Wado Ichimonji to Kuina's grave, since swords resting with their masters after death is a Shimotsuki practice, and Kuina is a confirmed member of the family. Zoro would be honoring her family tradition, and him taking up Wado Ichimonji on his quest to fulfill his and her dream is partly called back to by Kawamatsu's words in Chapter 953.
I saw this edited part just now...
Yeah, it is one way to give closure to the Wado Ichimonji plotline.
Returning it back to Kuina's grave is better than passing it on to new gen since as you said, it is a practice of Kuina's ancestors.
If there is any new gen that Zoro could have hopes for, it is probably Momonosuke since he is being shaped into the new golden child.
Which is one of the reasons why I think that Zoro may not continue his journey with Enma, because he could pass it on to Momo.
Another thing that makes me wonder is if the Zoro vs Mihawk rematch might take place back in the East Blue where they first met...