Yes, he might have gone too far with the restaurant thing, on the other hand, I liked that he took the "you are using her and I don't want to see her hurt" thing, not "she's mine, back off" thing.

I do like Tony/Ziva on the show - and Gibbs/Tony in fics ;P - but I really do think that he's doing it to protect her, not out of a deep love for her or something.

And did you see the preview? I do hope that Gibbs won't blame Tony for Rivkin's death. That would piss me off!