My preference is YYZ-NRT-YYZ and connecting with SQ from Narita. But I have also seen that lately the flight to PVG is easily upgradeable. For easy upgrades try to book Mon,Tue or Wed. Also on toureast I have found fares to SIN for about $1300 all in connecting in ICN,NRT and HKG(not easy to upgrade). Good Luck.