Who said he can't marry Hiyori as a non-Wanonian? I assume Oda is setting Hiyori up as Zoro's eos love interest. Like with SanjixPudding, LuffyxHancock, UsoppxKaya.
We'll see them in an epilogue but the story itself won't center around romantic relationships.