Help Urgentl Needed!

I'm a Thai residing in Singapore. I was born here in singapore ( doesn't qualify me to be a singaporean as my dad was a thai). I speak no thai at all.

Recently my application for permanent residence in singapore has been approved but my thai passport was being rejected because it's not valid (Stamps chops were watermarked because i left it in the washing machine due to my carelessness)

The singapore immigration wants me to get a new passport before they can officially grant me the permanent status. I've got till 21st January to complete the PR formalities.

I can't waste anymore time getting a new passport. Here's the big problem.

As you know Thai males are required to serve the military service for two years, and I last been to Thailand was in 2001. I was still under 21.

Should I go back to Thailand to make my new passport? I'm afraid of being detained as the immigration officials will ask me lots of questions regarding the military service issue.

Or should I play safe and appy for a new passport at the embassy in Singapore? Wait for 2 weeks to a month for a new passport, my temporary employment pass expires on the 14th of january in Singapore. That's barely more than a month away.

Do u have any thai friends that came across a very similar situation as me?

Please advice!