OK. Given what you've said, I see the wisdom of buying a new bike. There's no better reason to buy a new bike than because you just want one.
Have you looked at the
Fisher Monona? I guess it's a crap shoot as to whether your Trek dealer stocks it, and it's a bit pricier than some of your other options, but if you're going to upgrade, you should really upgrade.
What's with Trek still selling bikes with quill stems?