I'd like to see Goldust put over Cody at Wrestlemania.
I'd then like to see him return to "The Natural/ The American Nightmare" Dustin Rhodes as a top face, wrestling against the top heels up until SummerSlam, where he'd start to revert to his "evil" Goldust character; I'd run an angle where he has a split personality, the babyface cowboy Dustin Rhodes and the heel Goldust. TNA kinda touched on this during his run there and I really enjoyed it. I'd make The Prince Of Perve a top sadistic heel; I'd go as far as putting the WHC on him for a couple of months; then have him lose the belt to an up-and-coming star around Survivor Series time.
After his run with the Championship he can revert back to a babyface, have a retirement match at Wrestlemania 30 and be inducted into the HOF the following year.
That's how I'd book it anyway.