Yes! I imagine something about the metaphysical nature of the choice the peredhil make prevents them from choosing for external reasons - but as I've written it here, that means that when Arwen ultimately chooses to be counted among Men she doesn't do it solely because of her love for Aragorn, but also because of an internal affinity for that choice, which isn't everyone's impression/head-canon. Otherwise, I don't see why, even if she didn't go to Valinor with Celebrian, she wouldn't choose Elf-kind then simply to have a guarantee that she and her mother would see each other again.

I'm really glad you liked it!