Since the cost to add extra days goes down dramatically the longer you go, I would probably not have any off days myself. So version 2 I guess since that is less days off.
But instead plan several half-days in parks to enjoy hot afternoons/evenings at the pool. We find if we rope drop at 7am, we're ready to head back by 2pm and really fit in all we wanted. And by having 6+ days, you will be able to spend your last couple of days going back to parks you liked best to re-do. Our feet get really tired too the later on we go in the week. We can't imagine spending an entire day at the hotel. Even going to visit other hotels or Disney Springs. No thanks. We'd rather do a half-day in park instead. We also don't like mid-day breaks. By the time we return to hotel, etc no energy to go back.
We don't find the waterparks must do's. We would only do them if lucky enough to be there for 2 weeks (never gonna happen). We just have too much other stuff we want to see. E.g. one day seeing a parade, one day making sure we stay for fireworks, etc.
