Ok, I ran some different packages, with different options, and I came out about $500 more to do a room only discount than to do the SPD. I don't know if SPD will be offered in April or May, but if you decide to wait, looks like it will be a little more, but nothing outrageous. I ran 7 nights, with 6 day base tickets, and the regular dining plan, and got around 3600. That was for your current week, and for April. (assuming a 20% discount will come out for April) SPD for your week was around 3100.
Another option you have is to book room only for April, that way you can make your ADRs when it's time, and it will also give you a little more time to save the extra money. Then hopefully they'll offer SPD, and you get the best savings, or if it's only a room discount, you can have the extra time to save, and make it a package then.
If that won't work, or you want to be assured of the current discount, you could go ahead and book it, make your plans, and if a discount comes out for April that you want to use, just rebook it. Only issue with that is the ADR problem, but I think you can still work it that way.
If you need any further help, let me know. I'll check back here, or you can PM me. Good luck with everything!!
