It was like... the perfect subtext wrapped and tied with a pretty ribbon reading

I know! The only thing they could have done to fan service more would have been to actually have them make-out. But really, that fight scene was pretty much Mord'Sith sex, so they kind of did.