Even if you were able to get the non-o visa I don't think you would ever be here long enough to apply for a one year extension of stay. Your best option now would be to apply for a multiple entry non-o visa based upon marriage at Thai embassy or official consulate.
Now that you can easily enter Laos you could apply for the multiple entry non-o visa at the consulate in Savannakhet Laos.
The multiple entry visa allows unlimited 90 day entries for a year from the day it is issued.