I am going to Tokyo next week. Booked in PS and upgraded to D1 Suite (A350) upon booking by using GUC both ways. RT PS fare to Japan is only ~$2.2k these days. I just checked some random days in December and saw similar ~$2.2k RT PS fare widely available too. You should be able to confirm D1 upgrade (GUC) to Tokyo very easily.