Zen, instead of changing the stem, would you be able to install a riser or spacer of some sort to bring the bars higher? Considering the angle of the head tube, that might also bring the bars back a tad, too.

That looks like a heck of a deal for $100. But will your Trek get lonely if you start riding the Mariposa instead?