Get a Surly Long Haul and build it up or have your LBS build it. Cut the steering tube high and put spacers above the stem. That way you can raise the handglebars no problem. With a high handle bars, the 58cm frame might fit just right.
Or go the Trek 520 route, but be sure to special order the bike with the steering tube uncut.