I dont have the list for 2.0 handy, but last time I looked the only two Fantasy class ships getting 2.0 were the two who did not get waterworks upgrade. Elation and Paradise. Esctasy was not listed to get 2.0. .. so it probably will not be any time soon, if it does get 2.0.
Waterworks and serenity are not 2.0 upgrades.
Conquest 7/21/13, Miracle ALASKA 8/27/13, Miracle HAWAII 9/17/13, Celebrity Summit, 11/30/13, Celebrity Summit, 12/7/13, Celebrity Constellation, 2/7/14, NCL Epic 3/2/14, Allure 5/4/14, Allure 11/2/14, Quantum 12/8/14