Tokyo for sure!!
HKDL is smaller and "quieter", but some of that actually depends on the time of year it is as well. My son and daughter and I did it easily in a day with so so crowds and didn't feel as if we missed anything. For us, it was a nice experience, but made me miss WDW!
Also...