Sounds like you have earned a new bike. Nothing wrong with that, particularly if you are using it for commuting. I would encourage you to explore other makes and models rather than just Surly and Giant, since it sounds like you have time. Nothing wrong with either Surly or Giant, but you might find that the geometry of other makes suits you better. For all the Surly love around here, their geometry is all wrong for me -- top tubes too long and head tubes too short. The Salsa Casseroll or Soma Saga are better options if you prefer a more upright riding position.