yes the 7day for 4 - if you are really going to stay 7 nights can't be beat (at this time)
the key here is the time - are you really going to devote all 7 nights and 8 days to WDW - if yes - then definitely go for it - if not - join the waiting game!!!