I would've also liked the story better if Naruto had been a girl (Naruko) and the romantic undertones were about her and Hinata...
I'd be kinda like Card Captor Sakura, where the main lead girl is all energetic and naive, while her more "mature" and calmer best firned, is secretly in love with her...