I sympathise with the OPs view. I'd like to see options within the Companion UI that allow you to select if that Companion should be 'romanceable'.
That way players would not be 'forced' to, even avoid, romance type options within dialogue or actions taken.
i.e. If the Romance 'tag' is set to NO then romance/flirt options should not even occur within dialogues.
..and for this particular Companion - I'd like to see an additional Quest option that sends him to a Veteranarian for the required procedures !