Looking at the old bike's set up....just checking to see if you have planned to order the H3 version of the Madone in order to accommodate that riding position.
Beyond that...Sounds like a really nice gift.