I have a doubt. Why is Henry not listed as a character of Rumple and Cora's story? I mean, he's not the king, but Cora doesn't marry Henry's father. In any case, both of them could be considered as allusion to the original character: Xavier because he threatens Cora and is the king, and Henry because he marries Cora and is the father of her (second) child.
On the other hand, can Cinderashley be considered as an allusion to the Miller's daughter? I know this one is a lot less probable, but she makes the deal with Rumple: he changes her life and eventually she marries the prince, and she has to give him her first child. In the end she breaks the deal as well, though not by discovering his name.
Agree with Henry but disagree with Cinderella. I think she might have originally been an allusion to her, but after Cora, she would just be another one of Rumple’s deal people. (I also agree that Rumple is the fairy godmother.)
Agree that Henry could reference the King in the original story (as he is the part of the story, Xavier does not fill). Book 1 Cinderella I don't think has enough to be the Miller's Daughter, especially since Rumple would often make deals for babies (James and David, Jack and Jill's child, etc.). Similarly, I don't see Rumple as the Fairy Godmother, because we see her existing. Sure he does what she would normally do, but only because he killed her before she could do it.
He also bibbidi-bobbidi-does Emma and Hook for Midas' ball, so I think he has enough of a fairy godfather. As for Cinderella, her deal in "The Price of Gold" is exactly a readaptation of the Rumplestiltskin fairytale.