Aaah! The never ending search for the perfect fitting bike. I am convinced that by adjusting the saddle height and fore/aft position, combined with a different stem you can get multiple frame sizes to fit you like a glove (just make sure that standover height is not too high).
I am 6'2" with short legs and a long torso. I ride an 56 cm LHT with the longest an steepest stem available (Salsa Motoace SUL). My arms and shoulders have not had any complaints about thsi configuration.
Go to a good LBS and ask whether he is willing to exchange the stem for you, or give you a discount on a new one. That to me was the easiest solution, instead of spending the entire weekend visiting multiple LBSs
Good Luck
Duppie

Oh, looking at your wishlist. Did you copy that one from the Surly website?