Cyclocross bikes are great for commuting. You can set them up as similar to a road bike as you like. It will be heavier than your Madone. The up side is you can use if for CX racing in the fall. The wheels are compatible. If you get a CX bike with cantilever brakes (as opposed to discs), you'll almost certainly go through a period of complaining about that.

You could also consider a road bike with wider tire clearance like the Surly Pacer.