If you are already married, and you have access to your marriage certificate, you should be able to extend with 60 days, not just the regular 30.
When it's all sorted he can head to Laos and apply for the Non-O there, if there's not enough time left on the extension to convert to the Non-O in Thailand, or if he does not have a bank account yet.