Even on the deluxe plan, sushi isn't covered as an appetizer at Teppan Edo.
I'm not exactly sure how the plan works at Tokyo Dining, but I would guess they have both appetizer and entree sushi selections. If you try it, please post a quick review when you get home. I was pregnant on our last trip and thus avoiding good (raw) sushi, so we cancelled our ADR there. I'm really looking forward to checking it out on our next trip!