Sorry for the late reply.
But yes, you're right. Oda-sensei finally threw us a bone, also with the FBS kind of confirmation.
But still, on Zoro's side, this is as close to canon or any actual romance it goes. I took from the chapters, that Zoro still has a sword senpai-attitude towards Tashigi.
But the chapters made me really happy.
Ps: It's cool if you ship both pairings. As long as you enjoy it without putting other ships down, no one will take offense in the fact that you multi-ship. And ship wars are stupid anyway.