I would certainly go for a new bike, and keep the one you now have. Surly makes good bikes, but there are many options in that category. I am a fan of steel frame sets and think every rider should try one , at least.
You really need to figure out just what you want to do with the bike, figure out the best options in your budget. To me, putting that amount of dollars into the present bike, when you can get a brand new one that is likely going to be a better choice, for the same money, seems kind of senseless.
In the end, make a decision and act, or don’t.