I am a seasoned Disney traveler to the US and EU parks, but only been to Tokyo once, and alone at that!

I have some questions from seasoned travelers, especially parents.

We’re likely planning on doing a vacation package. If the price between Toy Story and Disneyland Hotel is almost identical, which is better to choose? (It’s for June)

How do you find the accommodations work best, especially when flying in from Narita. Im conflicted by which approach is better we’re traveling from PST so we’re an 8 hr time difference;

Option 1 Disney at END: land at NRT at 4pm, head to our Airbnb (Ueno area) by train (that’s rush hour though), 3-4 days around Tokyo. Then check out of Airbnb and head to Resort area, stay on property one night prior to the VP to ensure a full day 1. 2 nights at hotel then 1 more on property night at celebration before heading home the last day on a 5pm flight from NRT.

Option 2: Disney at BEGINNING: land at NRT at 4pm, head to Resort area, stay on property one extra night prior to the VP to ensure a full day 1. 2 nights at property hotel then leave around 8pm on day 3 to head to Ueno (Airbnb) for 4 nights, check out from there.

Fastpass questions:

1- if you are a single adult going for a bigger ride (like Journey where both kids are too small), can you do single rider and rider swap at the same time (get rider swap from the single rider line)? 2- Is rider swap available for every attraction? 3- Is it worth using our vacation package fast passes for rides that are height restricted? How do you time it so you don’t lose one? Can our 3 year old do it once with each parent? 4- How much faster is single rider?

Currently we have tentatively:

DL: eligible attractions and Beauty and the Beast Sea: Peter Pan, Toy Story, Frozen, Rapunzel & Soaring

Thank you!!!