@Stephen *******
the problem is that I need 6-8 weeks here for processing a new passport (so with holidays it might be closer to the 😎. And unfortunately I’m on a 30 day visa exempt, with an extension. So even though I got the extension early, and now have about 7 weeks, I didn’t get it early enough for allowing the potential for 8 weeks, processing of the new passport. And if I leave and get a longer visa, I’m not sure I will have sufficient free pages to get back in. Sometimes they are sticklers on that 2 empty page rule.
Notwithstanding all those facts, yes, getting the new passport first, would definitely be my choice.