First I had to shake my head, because your planning spreadsheet looks so much like mine. Only on the DIS will you find so many other uber planners. I need to show it to my husband and say "see, it's not just me"!
As for your plan, looks good to me! Have a great trip!