I do the IST-SIN/KUL route all the time and if you can upgrade only one way forget about the short haul, you definitely want to upgrade SIN-IST. Besides the reasons that you mentioned it will also greatly help you combat jet lag (you want to sleep as much as you can flying west and as little as you can east).