I think the rumple set up happened after jefferson’s convo with Regina about the wizard as rumple saw it as an opportunity.
I’m also not sure if whale/victor will be the wizard of Oz, the writters have tried to lead us one way before by using visual ‘clues’ and then turned it around in the end. I think he was made to visually look a little like he could be the wizard (with a few script misdirections by jefferson thrown in) but the end scene is a confirmation that he isn’t.
BUT then again if Rumple can be the beast and the crocodile as well, who really knows? (apart from the writters of course!, lol)