I lived in Japan for 6 years, in Koriyama city, Fukushima prefecture, and went through the Magnitude 9 quake on the 11th March 2011.
I'll second everything you said, with the addition of;
-- A generator if the power is cut off (luckily the power stayed on after that quake [ VERY luckily!])
-- Some gerry cans filled with gasoline [ with a regime of fuel rotation to keep the gas fresh ]
as you need fuel for the genny.
-- Keep your vehicle fuel tanks filled to the top - you might have to evacuate the area [ my house was 33 miles
from the Fukushima Dai-ichi power plant that went FOOM! ]
-- If you do live nearby by a nuclear power plant, get a Geiger counter [ bought one after the aforementioned BANG ]
-- Don't live nearby the sea [ Koriyama is smack bang in the middle of Japan and the scale of tsunami required to reach
there from the ocean would be so great that the cause of the tsunami (quake, asteroid, whatever) would render any
preparation or plans irrelevant anyway ]
-- Don't live at a low elevation, because even if you're some miles inland a tsunami can still get at you [ as happened in Japan ]
-- This includes not living nearby a river that runs to the sea for obvious reasons
Oh, and I moved me and mine back to my native Scotland - good, solid, ancient and most importantly, inert land.