Hydration Systems

Hi! I've been fine tuning accessories as I'm upping mileage on my Trek and embracing hotter summer rides & races. One of my biggest failures is hydration - and I'm thinking a system mounted between my aero bars may help me stay on target in addition to the lower frame cages. What's the general consensus between bottle mounts and the built-in systems with straw, like the Profile Design HSF/ Aero HC 800 Water Bottle?

I'd like something I can still clip my Garmin Edge into.