Those two bikes sound very good for the money. I just bought a Cannondale Jekyll 800 for $2499 with basically the same componetry. Go with the shimano 525 disc brakes over Hayes. Shimano uses mineral oil opposed to dot fluid with the Hayes. My 535 discs are just great!

Remember that you are buying the frame! Purchase a good frame and upgrade later.