Just depends on your exact situation I think.
We moved our April trip to mid-June and planned for All Star Music, standard room, deluxe dining package using the room discount (only thing available to us at the time). I switched to POP, preferred room, upgraded "free" dining to deluxe, and saved...