I think kishi is flirting with both ideas right now, Hinata called him kun and he called Sakura chan. This isn't enough to speculate about anything just yet. You have to remember Kishi admits being horrible when it comes to injecting romance into his writing.
