I think you're right. Keeping my fingers crossed that it turns out that way. I don't need T/Z to get together on the show (right now), but I do want to keep that possibility open!

I have to admit Ray and that darn ring box and the promised proposal do have me a little nervous, especially since GG said last season Ray + Ziva = hubba, hubba. (gag)
.
ETA: I found it interesting that the promo shots for Ray's episode didn't show Ray once while just about all the promo shots from EJ's episode showed her. I don't know if that is good or bad.