Wouldn't Japan's period of isolation between 1638 and 1853 be slightly longer? Unless there was some conflict in the middle of it which I'm unaware of...
Hmmm, that depends I guess. How large does a rebellion have to be before it tunrs into a war?
Still, wait another 20 years and it will be moot