Probably best to head into your local immigration office and get their handout. Thai immigration offices have a habit of interpreting the rules slightly differently from their friends!
What Stuart said ... I would only add that the rumour mill says that quarantine will soon be reduced (or even abolished). Always remember that (as with all things Thai) it remains a rumour until officially announced. Hopefully soon!