I was lucky and tweaked my bike (that initially didn't fit, or, rather, had the wrong components on it--saddle, stem, etc) but get the one that feels the best!

Also, could the shop that has the GIANT order you a Trek 2.1 in the size you need?