If you are at FL360 and 90 minutes out of Changi then the 'nearest suitable' airport isn't Changi, but, provided the condition was contained then I would have opted for a low level return to my base where sorting out the problem would have been a lot easier than, say, Dar Nang.