quit looking man you already have a decent bike. the bike in the ad is basically what I bought, I'll tell you right off the bat you'll need to replace the fork, and then very soon after you'll need a new crank, BB, atleast a new rear wheel if not both, new shifters and brake levers, and new derailers. and thats if you bought it new!!! only after all that would it be a decent bike. stick with the frankenbike and just keep upgrading components.
I'll tell you that if I had to do it all again I'd build my own (kinda what they did for you) using a build kit off price point or something rather then buy a bike from the shop again.