I would second the general idea here; make more like the DOS2 or the original Baldur's Gate games where romance is an option but there's some work involved, or so only one romance can be active at a time. So far every companion who wasn't in the original Baldur's gate trilogy has come onto my character when I thought I was just going through their quests or being nice to them. Bit of an immersion breaker, enough that I'd just turn off the romance paths if there's a friend zone option.

Though I did have an amusing conversation with my wife when she looked up from typing her clinical notes, said "O your guy is sleeping" and a shirtless mind flayer popped up right then.