Yes, I have encountered this also tonight.
I have a ps5.
I have gotten offers from both Astarion and Shadowheart.
When i do the full rest the storyteller ask me who I want to spend the night with.
I choose Shadowheart, but Astarion comes instead.
Sadly I haven’t saved enough so I have to kill the last of the leaders again… but this time I will avoid Astarion. I hope that cures it… but I am not hopeful.
