Yep, sounds valid to me. Just to clarify terminology here, make China your destination and NRT your stopover. Some agents are very adamant and don't use logic and will say you can't do China if you say it's a stopover, since it's the final destination. Have fun!