Yes, No. 4 is definitely where I'm at right now.
Since we've been every other year people - and the current schedule puts us at FOUR YEARS between Disney trips - with this summer being year two - I have two more years before we seriously start thinking about where we are going to be when and what attractions we want to do. By then, everything will be old hat, the guidebooks will be updated - and although I'm sure I'll feel a little lost walking into a Disney with a different Fastpass system and a new Fantasyland since last I went, I'll be able to follow enough guidebook guidance that combined with my own experience and a few weeks on the theme park forum, will make the trip easy. But I'm not willing to be the one to figure it out.
I'm not even concerned about a single headliner - as long as single rider lines stay in play our family uses them. We have teens. We really never need to ride Soarin' again (well, one day that MIGHT bother to change the movie). My kids will ride RnRC again - my husband never has and twice was plenty for me.