Your plans look very similar to the plans I have for my next trip -- just  a mother daughter trip and no clue whatsoever when it will happen.  Maybe I will be really old and need a w/c by the time we can go again -- that will get me in the handicap access to rides, correct?
I do have dates in mind -- fall -- sometime in the fall.  That's all I know.  I don't do crowds.