Oh, I very much agree with your interpretation, even though I managed to pair Kav up with Teyla in "Choices". But in the "Darkroom" series there's a hint about their recent break-up, and that they're fighting even more since then.

Looking forward for more of your K/S stuff.