*Update
Just crossed back over the Mae Sai border (30 days visa exempt). It took only a mater of minutes, and no questions asked. I had 25k I'm my pocket in case questions were raised, but it all went smoothly. I spent the night in Chiang Rai, but it's easy to do a same day trip from Bangkok if you wish to do so.