I think that you can't really go wrong with any of the bikes -- I suggested just upgrading to brifters because it seems the simplest. As for the Straggler being $1800 (MSRP)..the great thing about Surly is that you can buy the frameset + donor bike or bd bike and come out way ahead:
http://www.bikesdirect.com/products/...iberty_cxd.htm + Straggler frameset = $1100 + (Assembly fee) or;
http://bikeisland.com/cgi-bin/BKTK_S...ls&ProdID=2488 + Straggler = $1000 + (Assembly fee) or;
On the other hand--if it were me I'd do this and be done with it:
Motobecane CXX ($799): It's basically a poor man's Crosscheck w/Brifters--(no disc)
http://www.bikesdirect.com/products/...fantom_cxx.htm
Which should give you 90% of what you want (minus disc brakes)...Ride that for a while..if the brakes don't do it for you;
Buy a new frame-set ($450-ish) (I think i would prefer the Soma Double Cross Disc) and transfer your Apex group from the Moto over.
I've listed BD as examples..only because they are easy to link to..you can get better prices with patience and an eye on craigslist/ebay. Also, my next bike will most likely be something from Soma (Double Cross or Smoothie ES) and, I'm looking forward to a frame-up build.
If you are not afraid of doing some of the work yourself..it might make a nice winter project.
Good luck with whatever you choose. Also, do you have a secure place to store this awesome ride once you have it?