OP, both your suggestions would work.
As for entering visa exempt then obtain 60 day extension to visit wife then non O based on marriage would work.
The 400k only needs to be in bank for 2 months for the extension, it can then be used.
One wonders how he can support himself and wife if that financial requirement is difficult.