We're invited out to dinner tonight, and the host has made a point of saying that the main course will be beef short ribs braised in a smoked chipotle sauce. He says it's not very spicy, but quite smoky. He's leaving it to me to find the appropriate wine (I think he's challenging me

) .
I'm thinking Rhône initially-- Chateauneuf (I've got some '98 Tardieu-Laurent VV that's particularly oaky for this appelation, do oak and smoke work?)? I've got lots of different Chateauneufs, but also some steroidal Gigondas? Maybe Cote-Rotie, though it might be overpowered by the dish. Hermitage? Or Crozes-Hermitage?
Or should I be looking in a different direction?
I appreciate any comments/advice.