Yeah, I understand that. Having read the Butterfly story, I do think Odette would actually be more fitting, imo. You could always modify the curse so that it’s once a month rather than every three days. The transformation itself could also be temporary rather than permanent or maybe work in a solution so he doesn’t have to be 100% swan! I have to reread the story again but you can take things from the movie as well, it doesn’t strictly have to come from the OG story.

We got a Rapunzel with Bayonetta hair because of Tangled so hahah