Yes she did say that to Naruto, but it was due to the fact that he was being targeted by Akatsuki and because she didn't want him to get hurt once again and do things (like begging on his knees in front of the Raikage), because the promise he made when Sasuke went to orochimaru with the sound 5.

It can go either way, Hinata or Sakura, it all depends on what kishi wants, maybe he wont go with either one, he could die like he said to Sasuke after the fight with Danzo