If going to Odaiba for the day, I would strongly consider hitting up the teamLab Borderless digital art installation at the MORI building: https://borderless.teamlab.art/. Have heard great things about it and we'll be stopping by in June. Also consider purchasing tickets in advance.