@Tod ********
Just so I understand various permutations, should I get the re-entry stamp on my current entry (which is allowing a stay through 8 June) and leave, but then I am able to return back to Thailand before the 9 April expiration date of my multiple-entry Non-B, do I get stamped in for a new 90 days as I would normally be entitled to, or only for the remaining period granted by my re-entry permit? Also, do you see any issues if I get the re-entry permit, then apply for the single entry Non-B from the HK consulate once the current visa expires? They won't say I have permission to re-enter for a stay through June, will they, and therefore I cannot get a new Non-B until the re-entry permit expires?