See if you can have an extended stopover in Narita and fly to BKK for a day and they visit NRT on the way back. I have tossed a ticket before but it was the last leg of the trip. Theoretically, not flying the BKK-NRT portion would invalidate your ticket.