We also had a conflict on the Magic/Mariner. Wound up booking the Mariner because of the itinerary--but we had a terrific time last year on the Dream's TA . Either should be a great choice (I hope).
P.S. Snoozeman, hoped you booked a couple of months ago, the deals WERE wonderful!