I think there's too much being made of this guitars history and nailing it down etc. I think if you like this guitar, it clicks with you like it used to, then you should buy it, if you haven't already that is.
If it's an MIJ tokai, thats even better, but from your early remarks it's sounds like you have good feelings for this one regardless.
we're all guilty of country of manufacture snobbery, but a good guitar/golden fluke can come from any place, so if it's a proven instrument, i think the place it was made is less and less important, other than for interests sake.