A flat bar road bike/fitness bike sounds like a good fit for you. I went from a comfort bike to a flat bar road bike to a carbon fiber road bike. It seems that many have made similar journeys. Go by the bike that feels right, you'll know it when you ride it. Trek is just one of many good brands.