I have eight bikes (5 mtbs, one CX and one road bike and a folding bike) for the road I'd never have anything but a road or CX bike. Although ultra busy eg. NY, London developing Asian country streets a flat bar does give your more control.
Personally I'd experiment with the Madone and try fitting wider tires, putting on a shorter riser stem etc.