If you care so much about "canon", you're "shipping" wrong.
It's about what you believe.
What Oda says, what anyone says, it's irrelevant.
It's about a couple that you, and you alone, think look good together.
Keep moving forward, despite you being a filthy LuNa fan.
:P