For the requirements of the Non Immigrant O visa inside Thailand, the best is to visit your local Immigration Office and ask the hand out. Than you visit this web page and see the differences yourself and you can choose which is in your case the most convenient:
***************************************************************************