too bad about the raw deal. a 18' wouldn't work? longer stem maybe, a set back seat post? I does feel nice to get a deal on a bike.
I would hate to have to pay full price for a '06. If your friend has not ordered the '06 bikes yet, sometimes you can give them money upfront ( not all ) and then wait for the bike to arrive- month or a few. And then pay the rest with a slight discount. This makes it easy on their ordering.

good luck