I would leave the Huffy intact and ride it as is.

For the Surly I would write out a plan for which components you want to use, and then visit the bike oriented web sites and ebay. It will take longer (waiting for sales and clearance sales) but it will be worth it.