i would go with the Trek PDX or the Kona Dew Plus, although what I would really do is go with the frame I like the best and ask my LBS to set it up with exactly the components I want. That may take a little more money but ultimately it will make you happier to have exactly what you want and not need to upgrade anything on the bike. you already have a bike, why not save up a little more until you can afford your heart's desire?