What if you try that seatpost and handlebar in your Madone, perhaps with a different stem to make the position in your bike more upright?