Problem solved, Jomtien Immigration just said "GO BACK AIRPORT" so a weekend detour in BKK it was. I had no hopes and was preparing my soul for a trip to Chang Watthana.
Tourist police office landside at Suvarnabhumi 2nd floor. Walked in, brief explanation and got my stamp corrected and was in and out in around 30min.