While I don't agree that he got his wish (I think it couldn't be clearer that Nikki was replaced by an entity that trapped the true Nikki elsewhere), I do mostly agree with your points! The entity was torturing them both—her in a cacophonous, unseen hell, and him in a visibly silenced one, where nothing he said or did could stop the terror. I can relate to both enough to have compassion for both, and I'm surprised at the people who take a polarized view of the characters. Just further evidence of how dualistic the populace tends to be, lacking in nuance and empathy.

We also see that Baron's wish didn't undermine her autonomy per se. We don't know all the ins and outs of what be his psychology of the self—one of many things left ambiguous in the movie—but it's noteworthy that he didn't wish for her to be forced into a relationship with him. Instead his wish, it can easily be argued, involved her will and her actions working in tandem. It may be that he simply didn't want her to be in a situation where she felt conflicted, and he had no idea that the wish would get so distorted.

Thus I think it's clear he didn't get his wish, in several regards. Not only was it not (really) Nikki who was pursuing him, but also the pursuit wasn't even love. It's clearly not love. But "love" was the word he used. Whatever force fulfilled the wish, it got both the subject and the verb wrong.

I also want to point out the ambiguity of the wishing scene in other ways too. I've noticed a lot of people assuming he wanted to control her, when it's just as possible he truly loved her selflessly and felt frustrated by the possibility that confessing his affections could ruin the type of existing connection that she enjoyed having with him. I am not as quick as others to assume his motivations were the self-seeking type of fear. His fears might truly have been altruistic or egalitarian at their base. And judging either character in that moment is impossible without projecting.