Alright well I ended up buying the Trek 7.1 FX last Monday and have put almost 200km on it in 6 days. It runs great, no problems at all. Just have to take it back in for adjustments to get the cables tightened back up.

Thanks for all your help. I'm happy I got the Trek.