At this level it's probably a matter a preference. Both units are very good and well reviewed. Most people would think you are insane for buying the gear you currently own. Only you can make the call on spending an "additional" $2000 for a CD player. There may be a certain "synergy" between the Ayre components since they were likely R&D'd together. This is something to consider. For some, cosmetics count, a stack of all matching gear always looks good.
In the old days you could take gear home and try it out. If you can work something out with your dealer you are lucky. You can always buy used on Audiogon and then sell it for little or no loss if you don't like it.
In the old days you could take gear home and try it out. If you can work something out with your dealer you are lucky. You can always buy used on Audiogon and then sell it for little or no loss if you don't like it.