Yes, this. I'm sure they planned some aftermath of the dagger healing and had to change things up a lot and at the same time messing as little as possible with future plans for everyone.
My impression was that they needed a some drama to drive everyone to a certain point where they separated, some made up etc this episode to drive character progression and that's what they landed on. Still don't like it as I agree and I abhorr love triangle drama so wish they had found something...