Entering SG as a tourist after EP cancellation

Hello!

I quit my job a couple of weeks ago and my EP was cancelled. I got a 90-day STVP, but I plan to go back to my home country without staying for the whole 90 days (more like 7 days).

However, in about 3 weeks' time, I need to come back to Singapore to show a very close friend around (the friend decided to visit because of me!). I will be a legit tourist so I will come with a return ticket, accomms booking, and only stay for 1.5 - 2 weeks. My nationality gets 90-day stay as a tourist.

I am curious if this may raise concerns at immigration? I am genuinely coming for tour reasons but I want to avoid any problems. This is the first part of my question.

The second part of the question is that I actually do have another offer in Singapore, but the EP is not out yet. I am eligible based on the SAT and my next company has very good standing in terms of hiring locals vs. foreigners. Conservatively speaking, it will be out around mid July, seeing the recent results of peers (3-4 weeks minimum). If I don't get my EP during my 1.5-2 week visit, I will go back to my home country.

But if my IPA does come out during the stay, can I cancel my return ticket to my home country get the EP issued? Or should I leave the country first and then come back on IPA?

And, during immigration, if an officer asks should I tell them I have an EP application pending?

It's a tricky situation for me as I do have a job to come back to Singapore for, but my upcoming trip isn't for any job purposes unless if the EP comes out. Anyone experienced this before?