Right now you are fine leaving and re-entering. Nothing published and no checks reported at borders. Do not worry right now. If anything changes, and it is an "IF" then deal with it then. Worry when and if the time comes. Good luck.
You forgot Medical Certificate :-) Many of those agents offering license without test are scammers. Many operating from scam centres in Burma and Cambodia
Anonymous participant 589 Thailand Digital Arrival Card. Replaces the old paper TM6 that was suspended a few years ago. Starts on May 1st for all non-Thai passport holders.