F@ck it, bring Flair in and do it.
There is no downside to having Flair manage Dolph Ziggler. WWE fans will mark out for Flair's return to "the" wrestling show, "WOO!" chants will come back in style and there will be enhanced focus on Ziggler. Even if it doesn't pan out, Ziggler will be in a better spot because being managed by the Nature Boy is a feather in his cap.
I'd have him publicly dump Vickie and introduce Flair as his manager in one shot. You could do a quick match on the same show between Ziggler/Flair and Swagger/Guerrero that ends with Ziggler coming out on top. Have Swagger tear up the midcard afterward with the undivided focus of Guerrero as his manager so Ziggler will look that much better by beating him.
With Flair's star power attached to Ziggler, he's main event ready. Feud him with Cena, Punk, Sheamus or any main event babyface. Whenever Ziggler outgrows Flair as manager they can have a "street fight" or hell even a wrestling match if WWE is cool with ignoring his retirement. Ziggler won't get overshadowed by Flair, he has everything to gain.