Im going with either Foley and Umaga (Foley wants revenge on Vince, what better way then be the guy who leads him to have his head shaved).
Or Austin vs Shane...alot of history, this would be great, the promos would be great, and Austin wouldnt really need to put on much of a wrestling match.