Your best bet is probably to sell and buy the bike you actually want to ride. There's no reason that you shouldn't be able to swap your parts to another frame, particularly another Defy (Unless something's changed recently, all aluminum Defy frames are the same save for color schemes), just understand ahead of time that it will cost a pretty penny if you have the LBS do the frame swap (on the order of $100-200) on top of whatever you pay for the frame.