I think keeping the flirting is fine - but Tav should have opportunity to respond to it!
How about actually getting to blast a companion for such behaviour? Give them the boot? They could be some of several degrees of response. What's annoying is crap being said and silent Tav just has to eat it up, raw, with a smile.
Btw, I think there might be opportunities to end things with SH near the end. I recall in some conversations I had weird options to say nasty things to her.
