Your plan will work. (But on balance, my preference would still be for a hotel near the center of Narita city rather than out on the lonely road to the airport where I am forced to wait for shuttle buses to go anywhere - which impedes my ability to just pop down on a whim to the Seven Eleven for some niku man and haagen dazs).

For the luggage, you should be able to check your luggage through (since the stopover is just under 24 hours) so that you need not be encumbered with large suitcases for the short time in Japan.