The Thai consulate in Savannakhet Lao is issuing year-long, multi-entry, Non-O visas based on marriage to a thai just like they used to with the same document requirements as before and without the proof of funds just like before as well.
You DO need an approved thai pass to get back in to thailand for that border crossing.
**************************