Thank you for reply & another query
Thank you for your replies guys. That's quite helpful.
I think I'll do that: Will call the airlines for the upgrade.
Another question: can I choose to upgrade only for one leg of the journey? ZRH to DOH is under 6 hours but DOH to SIN is a longer haul.