truthfully at that range I would go with the Giant, and save while you decide if you want to upgrade the whole bike or just the fork, or maybe even find you are happy with what you have.