Cap'n Willow, I think you made a good choice.  I have the Giant OCR1, the earlier version of your new bike.  I like it a lot as it rides well without excessive road vibration and is very stable on down hill runs as well.  The Trek that was mentioned seems to have lower grade Shimano shifters than your bike does.   I may move up to a full carbon bike, probably a Giant, but the OCR has been great.  Good luck with it and don't forget your helmet!