Definitely Patrick. I'd throw Takahiko Kozuka in there as well, and maybe Takahashi. Carolina for the ladies.
I don't think Carolina would have had the nerves to be a really good figures specialist.
It occurs to me that if you go with 21 years, Brian Boitano, who skated at the 1994 Olympics, would be included, in which case, Brian probably wins. Victor Petrenko, another returnee, finishes second.
Katarina Witt, another returnee in 1994, wins the ladies.
figures required steely nerves as well as great edges
Patrick and Kozuka. Kostner and Mao would do well too probably.