Here are a couple of suggestions that would help when building a better plan.
1, Since Disneyland and DCA are so close how about being able to combine both parks.
2, Add a category that would include things like. Fantasmic Dinner, WOC dinner or desert party. Have the plan tell you when you should arrive for these shows.