Currently is the correct word, my kids schools also closed for 2 weeks, but no one promises that it won't be more (hopefully it's just 2 weeks, my son's birthday is in april and he is all set on a disney trip)
I don't mind having the games behind closed doors, but it will definetly be weird, tokyo will probably rather postpone because they will loose so much money on it, and while ioc might not loose, tokyo most definetly will
and yes waiting until may is fine, and hopefully it will be ok, the last thing i want is olympic postponement but if we go by current situation a postponement is the right thing, but waiting for 2 months in hopes of containment is perfectly fine (plus japan really should work on some sort of technology that they will put in all the venues that recognizes if a person have the virus before entering)