Thanks for the feedback everyone! Looks like I'll be getting up pretty early to get to the airport, but it sounds like the typical 2 hour rule should be fine for me, so that's good I suppose.
I'll make sure I only buy DF in NRT after I clear security (going both ways).