I don't know what kind of handlebars you have on the Warbird, but perhaps check into the Salsa Woodchipper or Cowbell bars. The drops flare, could be a good in betweener for your hands.

(Wait, you had a Fargo, you know better than me).
Haven't looked at the Warbird geometry in awhile, but it seems like it was an aggressive build.
I suppose the Vaya would be a good option. Unless you really do miss your Fargo. I'm the member of a Surly/Salsa used bike group on Facebook that Skyking told me about. A lot of used Fargos on there. What size is the Warbird?