As a Trek lover I would Always pipe up about trying a Trek. I'd say since you've got Fluffy all decked out in the pretty commuter gadgets, you need a nice zippy FAST road bike with the latest and greatest! Of course if money truly Were no object - I'd say build yourself a Trek Project One! (I just saw one at my LBS this sat......they even let me hang on to it.....*sigh* thought I'd died and gone to perfect bike heaven!!)
Life should NOT be a journey to the grave with the intention of arriving safely in an attractive and well preserved body, but rather to skid in sideways, champagne in one hand, strawberries in the other, body thoroughly used up, totally worn out and screaming: "Yeah Baby! What a Ride!"