Agreed, sell off the Tiagra stuff and maybe even the old wheels and recoup some cash. That makes the deal even better.

Would you update this thread once the bike is "overhauled" and post a pic?