Did they say that the quill was the Blue Fairies’ quill?
I just don’t believe that Rumpel has any grand plan for his deal. I think that he has a plan, but not a plan based on foreknowledge. I think he is going from one deal to the next making the best decision to work for his plan whether that is to die or to destroy the queen somehow. I don’t think that he killed Cinderella’s fairy godmother just so that he could get the deal with Cinderella. He even warned her off doing the deal with him and she did it anyways. I think Rumpel’s goal in killing the fairy godmother was to take her wand and had nothing to do with Cinderella and he just did the deal with her because the situation presented itself.
Though i think his character is badly written so maybe they are trying to suggest he meant to do a deal with Cinderella and it was just badly written.