I had the same model Trek as Emily's DH for a few years. Actually, ever should have sold it! I now have a Trek Silque (now part of the Domane series), which has more of an endurance geometry, though still a carbon drop bar road bike. If you want to stick wit flat bar, I'd suggest looking at one of the mid to higher end Trek FX series. There are tons of models, but they are a really good flat bar road bike.
I also had a Jamis Coda, which is a steel flat bar road bike. It's heavier and I used it for commuting and errands, but it was fun to ride. They make a lighter alu version. Again, cheaper components, but fun.
2015 Trek Silque SSL
Specialized Oura
2011 Guru Praemio
Specialized Oura
2017 Specialized Ariel Sport