go with the giant, sounds like you have a great starting point. Saving some coin to buy tubulars is the smartest investment!! If having a bunch of manufacturer logos on your bike doesnt sit well with you, you can always remove them!!
I just converted my cx bike over to sram, no races yet, but absolutely love the way it shifts!!! My only word of advice is make sure you test ride them both, try and do some dismounts and remounts, shoulder the bikes to get a feel for how they are going to handle!!! Good luck!!