The retcon that she's in love with him is a lot more recent than that, though.
No, actually, more than being in love with Bruce, what prevents me from calling her 'well-adjusted' is that she tells him, knowing how he reacts and treats people who love him. He's still everything you describe, it's just that the amounts of mind-fuckery one has to be willing to put up with for the sake of caring for him is... yeah. I for one understand and respect entirely why she decided it was not worth it after all.