The answer to the first question is yes it will be a transit and you will be protected as the flights are on the same PNR. You will be able to transit at NRT and sit it out airside if that is what you choose to do. There should be no problem with baggage being checked all the way.

I can't answer your second question.