What are the current visa options and requirements for a foreigner married to a Thai citizen?

Callum, just to add the information Brandon gave you - as I was in a similar position and recently applied for a 90 day non o, based on marriage to a Thai national - you will note that there are several sections of the application that require you to submit documents and on some you may need to send 2 or 3 to satisfy the question. However, it is only possible to send one document per section. To overcome that problem, there are plenty of websites that will allow you to merge multiple documents into one. For example, I sent in 3 bank statements in PDF format that I had merged into one beforehand. As far as I know though, the documents to be merged must all be of the same format. So if you wanted to send 2 documents to satisfy a particular section they would both need to be of the same format. One JPEG and one PDF cannot be merged. You can though, convert a JPEG to PDF or vice versa online - again free. Beware some of the 'free' websites will actually try and charge you or ask you to register with them. Can't remember which one I used but I think this one is OK - if not, look around, there are plenty that are genuinely free. They are also very easy to use - you don't need to be particularly 'techie'. I applied on 8 June and received my visa on 22 June.

Non O is 90 day. You enter thailand on that and put 400,000 tbt in bank account, if you don't already have it in the bank. You then apply for 12 month extension based on marriage. For departure I think that's optional, someone else will know that but if not put a flight number and date within the 90 days.

There is no 1-year non-O visa. Only the extensions you obtain inside of Thailand are for a year.

Because the initial visa only gives you permission to stay for 90 days, you still need to put an exit date within those 90 days. Just pick a date and put it on your application. You're not required to leave on that date as you can apply for an extension.