I’m also happy with the villain story having a positive roleplay, but you cannot deny that not everyone plays it this way, as proven by the 6 months of players romancing AA with patch 6 expressions.
I agree. Neither side needs to lose their roleplay. If the player could continue to choose for their Tav to be happy in the relationship, I don't think other players being allowed to keep their own story with the original Patch 6 faces too would take anything away from that or add an element of moralizing. It would just mean everyone could play their Tav and story in a way that makes sense to them and they are comfortable with.