SG to Nagoya / Tokyo

Hi! I’m looking to bring my toddler on a week long trip to Nagoya in first week Oct to check out the following:

• Legoland
• SCMaglev and Railway Park
• Flight of Dreams

Am also thinking of spending a few days and returning to SG via Tokyo.

Any tips / suggestions on the proposed itinerary and recommendations for other family friendly activities / accommodation?

Thank you!