Oda hasn't invested more plot in any other villain than Doflamingo. Only Blackbeard will surpass him in that regard.
You can tell he's itching to bring him back, but it'd be disrespectful to Law for him to be released so soon. It might be done by Final War, but there has to be some redemption from his part, because Law/Corazon will mean nothing.